backend/server/importlib/headerSource.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 88e29677361c7051475f4e53a796b5182119bc54
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Fri Jul 24 17:37:19 2009 -0300
513073 - Fix rhnpush of packages with duplicate requires.
Detects duplicate requires/provides/obsoletes/conflicts based on a hash
of name/version/flags.
diff --git a/backend/server/importlib/headerSource.py
b/backend/server/importlib/headerSource.py
index 0be41d6..e41e854 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -209,10 +209,10 @@ class rpmBinaryPackage(Package, rpmPackage):
obj = Class()
# Fedora 10+ rpms have duplicate provides deps,
# Lets clean em up before db inserts.
- if tag == 'provides':
+ if tag in ['requires', 'provides', 'obsoletes',
'conflicts']:
if not len(hash['name']):
continue
- dep_nv = hash['name'] + hash['version']
+ dep_nv = (hash['name'], hash['version'],
hash['flags'])
if dep_nv not in unique_deps:
unique_deps.append(dep_nv)
@@ -222,7 +222,6 @@ class rpmBinaryPackage(Package, rpmPackage):
# duplicate dep, ignore
continue
else:
- # requires, conflicts, obsoletes lets process as usual
obj.populate(hash)
self[tag].append(obj)
Show replies by date