aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2013-10-14 20:53:05 +0000
committerPascal Terjan <pterjan@gmail.com>2013-10-14 20:53:05 +0000
commit0d03bba02be25425ee5abde9a437e4657bf1e39f (patch)
tree7eb18cc3dc8c893777ad604768733248ae03df1d
parente4238c4cb2736ef13208bd08fd235f980e6903be (diff)
downloadrpm-setup-0d03bba02be25425ee5abde9a437e4657bf1e39f.tar
rpm-setup-0d03bba02be25425ee5abde9a437e4657bf1e39f.tar.gz
rpm-setup-0d03bba02be25425ee5abde9a437e4657bf1e39f.tar.bz2
rpm-setup-0d03bba02be25425ee5abde9a437e4657bf1e39f.tar.xz
rpm-setup-0d03bba02be25425ee5abde9a437e4657bf1e39f.zip
Only add new provides for now, to add them everywhere before switching requires
-rwxr-xr-xpythoneggs.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/pythoneggs.py b/pythoneggs.py
index a2d9bc0..f4beedc 100755
--- a/pythoneggs.py
+++ b/pythoneggs.py
@@ -100,6 +100,15 @@ for f in files:
spec = ('==', dist.version)
if not spec in py_deps[name]:
py_deps[name].append(spec)
+ # Temporary: Keep old style provides until all packages have new style ones and requires can be switched
+ name = 'pythonegg(%s)' % dist.key
+ if not name in py_deps:
+ py_deps[name] = []
+ if dist.version:
+ spec = ('==', dist.version)
+ if not spec in py_deps[name]:
+ py_deps[name].append(spec)
+ # /Temporary
if Requires or (Suggests and dist.extras):
name = 'python(abi)'
# If egg metadata says package name is python, we don't add dependency on python(abi)
@@ -123,7 +132,7 @@ for f in files:
deps = depsextras
# add requires/suggests based on egg metadata
for dep in deps:
- name = 'pythonegg(%s)(%s)' % (py_major, dep.key)
+ name = 'pythonegg(%s)' % dep.key
for spec in dep.specs:
if spec[0] != '!=':
if not name in py_deps: