|
 |
d64bb3e |
From eb48f08dd30324f960b8e404b80eb885b2bbb593 Mon Sep 17 00:00:00 2001
|
|
|
d64bb3e |
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
|
d64bb3e |
Date: Thu, 24 Aug 2017 13:45:49 +0200
|
|
|
d64bb3e |
Subject: [PATCH] Do not provide pythonXdist for platform-python packages
|
|
|
d64bb3e |
|
|
|
d64bb3e |
---
|
|
|
d64bb3e |
scripts/pythondistdeps.py | 5 ++++-
|
|
|
d64bb3e |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
d64bb3e |
|
|
|
d64bb3e |
diff --git a/scripts/pythondistdeps.py b/scripts/pythondistdeps.py
|
|
|
d64bb3e |
index 2abb59f49..f624fdbb7 100755
|
|
|
d64bb3e |
--- a/scripts/pythondistdeps.py
|
|
|
d64bb3e |
+++ b/scripts/pythondistdeps.py
|
|
|
d64bb3e |
@@ -16,6 +16,7 @@ from os.path import basename, dirname, isdir, sep
|
|
|
d64bb3e |
from sys import argv, stdin, version
|
|
|
d64bb3e |
from distutils.sysconfig import get_python_lib
|
|
|
d64bb3e |
from warnings import warn
|
|
|
d64bb3e |
+import re
|
|
|
d64bb3e |
|
|
|
d64bb3e |
|
|
|
d64bb3e |
opts, args = getopt(
|
|
|
d64bb3e |
@@ -78,6 +79,9 @@ for f in files:
|
|
|
d64bb3e |
f = f.strip()
|
|
|
d64bb3e |
lower = f.lower()
|
|
|
d64bb3e |
name = 'python(abi)'
|
|
|
d64bb3e |
+ if re.search(r'/usr/lib(64)?/platform-python\d\.\d', lower):
|
|
|
d64bb3e |
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1484607
|
|
|
d64bb3e |
+ continue
|
|
|
d64bb3e |
# add dependency based on path, versioned if within versioned python directory
|
|
|
d64bb3e |
if py_abi and (lower.endswith('.py') or lower.endswith('.pyc') or lower.endswith('.pyo')):
|
|
|
d64bb3e |
if name not in py_deps:
|
|
|
d64bb3e |
@@ -115,7 +119,6 @@ for f in files:
|
|
|
d64bb3e |
if not dist.py_version:
|
|
|
d64bb3e |
# Try to parse the Python version from the path the metadata
|
|
|
d64bb3e |
# resides at (e.g. /usr/lib/pythonX.Y/site-packages/...)
|
|
|
d64bb3e |
- import re
|
|
|
d64bb3e |
res = re.search(r"/python(?P<pyver>\d+\.\d)/", path_item)
|
|
|
d64bb3e |
if res:
|
|
|
d64bb3e |
dist.py_version = res.group('pyver')
|
|
|
d64bb3e |
--
|
|
|
d64bb3e |
2.13.5
|
|
|
d64bb3e |
|