diff options
| author | Richard Hughes <richard@hughsie.com> | 2012-04-02 17:28:31 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2012-04-02 17:28:31 +0100 |
| commit | 4e7d9b80e0b9acce3360357eb871f45dc06117da (patch) | |
| tree | 52e5949e3c2937c05d0eb1e883dddd65865b2741 | |
| parent | b0985cecd057e184bd797a8004b3d5f26d525efc (diff) | |
yum: Convert all instances of Message(untrusted-package) to Package(untrusted)
| -rwxr-xr-x | backends/yum/yumBackend.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py index ab31b770..f800890c 100755 --- a/backends/yum/yumBackend.py +++ b/backends/yum/yumBackend.py @@ -1785,7 +1785,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage): if only_trusted: self.error(ERROR_CANNOT_UPDATE_REPO_UNSIGNED, "The package %s will not be updated from unsigned repo %s" % (pkg.name, pkg.repoid), exit=False) return - self.message (MESSAGE_UNTRUSTED_PACKAGE, "The package %s from repo %s is untrusted" % (pkg.name, pkg.repoid)) + self._show_package(pkg, INFO_UNTRUSTED) try: self._runYumTransaction(allow_skip_broken=True, only_simulate=False) except PkError, e: @@ -2024,8 +2024,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage): if only_trusted: self.error(ERROR_CANNOT_INSTALL_REPO_UNSIGNED, "The package %s will not be installed from unsigned repo %s" % (pkg.name, pkg.repoid), exit=False) return - self.message (MESSAGE_UNTRUSTED_PACKAGE, "The package %s from repo %s is untrusted" % (pkg.name, pkg.repoid)) - + self._show_package(pkg, INFO_UNTRUSTED) try: self._runYumTransaction(only_simulate=simulate) except PkError, e: @@ -2185,7 +2184,6 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage): if only_trusted: self.error(ERROR_MISSING_GPG_SIGNATURE, _to_unicode(e), exit=False) return - self.message (MESSAGE_UNTRUSTED_PACKAGE, "The package %s is untrusted" % po.name) self._show_package(po, INFO_UNTRUSTED) except exceptions.IOError, e: self.error(ERROR_NO_SPACE_ON_DEVICE, "Disk error: %s" % _to_unicode(e)) @@ -2362,8 +2360,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage): if only_trusted: self.error(ERROR_CANNOT_UPDATE_REPO_UNSIGNED, "The package %s will not be updated from unsigned repo %s" % (pkg.name, pkg.repoid), exit=False) return - self.message (MESSAGE_UNTRUSTED_PACKAGE, "The package %s from repo %s is untrusted" % (pkg.name, pkg.repoid)) - + self._show_package(pkg, INFO_UNTRUSTED) try: self._runYumTransaction(allow_skip_broken=True, only_simulate=simulate) except PkError, e: |