|
 |
fb5bfe |
diff -up createrepo-0.9.9/createrepo/merge.py.old createrepo-0.9.9/createrepo/merge.py
|
|
|
fb5bfe |
--- createrepo-0.9.9/createrepo/merge.py.old 2015-12-08 11:08:51.998837759 +0100
|
|
|
fb5bfe |
+++ createrepo-0.9.9/createrepo/merge.py 2015-12-08 11:09:58.868951847 +0100
|
|
|
fb5bfe |
@@ -70,9 +70,7 @@ class RepoMergeBase:
|
|
|
fb5bfe |
|
|
|
fb5bfe |
for repo in repos:
|
|
|
fb5bfe |
for pkg in repo.sack:
|
|
|
fb5bfe |
- others = self.yumbase.pkgSack.searchNevra(name=pkg.name, arch=pkg.arch)
|
|
|
fb5bfe |
- # NOTE the above is definitely going to catch other versions which may
|
|
|
fb5bfe |
- # be an invalid comparison
|
|
|
fb5bfe |
+ others = self.yumbase.pkgSack.searchNevra(pkg.name, pkg.epoch, pkg.version, pkg.release, pkg.arch)
|
|
|
fb5bfe |
if len(others) > 1:
|
|
|
fb5bfe |
for thatpkg in others:
|
|
|
fb5bfe |
if pkg.repoid == thatpkg.repoid: continue
|
|
|
fb5bfe |
commit b8904f59773a478aedd416963ec451c678a6bb72
|
|
|
fb5bfe |
Author: Zdenek Pavlas <zpavlas@redhat.com>
|
|
|
fb5bfe |
Date: Wed Jan 29 09:53:37 2014 +0100
|
|
|
fb5bfe |
|
|
|
fb5bfe |
Support API users that set pkglist=<package sack>. BZ 1058975
|
|
|
fb5bfe |
|
|
|
fb5bfe |
Commit 84a237f6a2e661879147e1ee5f9a2be984267991
|
|
|
fb5bfe |
broke this use case. Make it work again.
|
|
|
fb5bfe |
|
|
|
fb5bfe |
diff --git a/createrepo/__init__.py b/createrepo/__init__.py
|
|
|
fb5bfe |
index b1875f6..85f2a3d 100644
|
|
|
fb5bfe |
--- a/createrepo/__init__.py
|
|
|
fb5bfe |
+++ b/createrepo/__init__.py
|
|
|
fb5bfe |
@@ -400,7 +400,9 @@ class MetaDataGenerator:
|
|
|
fb5bfe |
if self.conf.update:
|
|
|
fb5bfe |
self._setup_old_metadata_lookup()
|
|
|
fb5bfe |
# rpms we're going to be dealing with
|
|
|
fb5bfe |
- if self.conf.pkglist:
|
|
|
fb5bfe |
+ if isinstance(self.conf.pkglist, MetaSack):
|
|
|
fb5bfe |
+ packages = self.conf.pkglist
|
|
|
fb5bfe |
+ elif self.conf.pkglist:
|
|
|
fb5bfe |
packages = []
|
|
|
fb5bfe |
for pkg in self.conf.pkglist:
|
|
|
fb5bfe |
if '://' in pkg: # remote
|