|
 |
7eb65f9 |
commit 4dfcd53103ac572e27e67e85088b6dee48b2e171
|
|
|
7eb65f9 |
Author: Richard Hughes <richard@hughsie.com>
|
|
|
7eb65f9 |
Date: Thu Apr 2 11:20:55 2009 +0100
|
|
|
7eb65f9 |
|
|
|
7eb65f9 |
bugfix: yum cannot handle FakeRepository.repo, unlike a normal Repository, so just handle the local case specially. Fixes rh#486720
|
|
|
7eb65f9 |
|
|
|
7eb65f9 |
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
|
|
|
7eb65f9 |
index f13bd9d..aade7bd 100755
|
|
|
7eb65f9 |
--- a/backends/yum/yumBackend.py
|
|
|
7eb65f9 |
+++ b/backends/yum/yumBackend.py
|
|
|
7eb65f9 |
@@ -2641,8 +2641,13 @@ class PackageKitCallback(RPMBaseCallback):
|
|
|
7eb65f9 |
# we don't know the summary text
|
|
|
7eb65f9 |
self.base.package(package_id, status, "")
|
|
|
7eb65f9 |
else:
|
|
|
7eb65f9 |
+ # local file shouldn't put the path in the package_id
|
|
|
7eb65f9 |
+ repo_id = _to_unicode(self.curpkg.repo.id)
|
|
|
7eb65f9 |
+ if repo_id.find("/") != -1:
|
|
|
7eb65f9 |
+ repo_id = 'local'
|
|
|
7eb65f9 |
+
|
|
|
7eb65f9 |
pkgver = _get_package_ver(self.curpkg)
|
|
|
7eb65f9 |
- package_id = self.base.get_package_id(self.curpkg.name, pkgver, self.curpkg.arch, self.curpkg.repo)
|
|
|
7eb65f9 |
+ package_id = self.base.get_package_id(self.curpkg.name, pkgver, self.curpkg.arch, repo_id)
|
|
|
7eb65f9 |
self.base.package(package_id, status, self.curpkg.summary)
|
|
|
7eb65f9 |
|
|
|
7eb65f9 |
def event(self, package, action, te_current, te_total, ts_current, ts_total):
|