[PackageKit/f16] yum: fix regression introduced by the fix-trusted-packages patch

[Nils Philippsen]

commit ba942d87d8b0b6e48a9ba01f513976d3a25163c2
Author: Nils Philippsen <nils at redhat.com>
Date:   Mon Apr 2 15:41:17 2012 +0200

    yum: fix regression introduced by the fix-trusted-packages patch

 PackageKit-0.6.21-fix-trusted-pkgs.patch |   55 ++++++++++++++++++++++++++++++
 PackageKit.spec                          |    5 ++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/PackageKit-0.6.21-fix-trusted-pkgs.patch b/PackageKit-0.6.21-fix-trusted-pkgs.patch
index 604fd1b..43199ab 100644
--- a/PackageKit-0.6.21-fix-trusted-pkgs.patch
+++ b/PackageKit-0.6.21-fix-trusted-pkgs.patch
@@ -32,3 +32,58 @@ index fd73f87..beb027e 100755
 -- 
 1.7.7.5
 
+From c21386f1eed193516c53b06749b4117eedede9d7 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Thu, 29 Mar 2012 12:02:31 +0200
+Subject: [PATCH] yum: always set GPG checking members if present
+
+This fixes a regression introduced in commit
+1055c52d723346006d8bbb7e0f2b324c9de9b82f which caused users to be asked
+to authorize installing signed packages when they were unsigned, i.e.
+untrusted (see rhbz#717566).
+(cherry picked from commit e8174800c75240379f804ff4a3c6032d49a03a69)
+---
+ backends/yum/yumBackend.py |   18 ++++++++----------
+ 1 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
+index beb027e..1cb7a8e 100755
+--- a/backends/yum/yumBackend.py
++++ b/backends/yum/yumBackend.py
+@@ -1717,25 +1717,23 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
+ 
+     def _set_only_trusted(self, only_trusted):
+         # if only_trusted is true, it means that we will only install/update
+-        # signed files
+-
+-        # _override_sigchecks logic is reversed
+-        override_sigchecks = not only_trusted
++        # signed files and fail on unsigned ones
+ 
+         if hasattr(self.yumbase, "_override_sigchecks"):
+-            # yum >= 3.2.29:
++            # _override_sigchecks logic is reversed
++            override_sigchecks = not only_trusted
++
+             self.yumbase._override_sigchecks = override_sigchecks
+ 
+             for repo in self.yumbase.repos.listEnabled():
+                 repo._override_sigchecks = override_sigchecks
+ 
+-        else:
+-            # yum < 3.2.29:
+-            for attrname in ("gpgcheck", "repo_gpgcheck", "localpkg_gpgcheck"):
++        for attrname in ("gpgcheck", "repo_gpgcheck", "localpkg_gpgcheck"):
++            if hasattr(self.yumbase.conf, attrname):
+                 setattr(self.yumbase.conf, attrname, only_trusted)
+ 
+-            for attrname in ("gpgcheck", "repo_gpgcheck"):
+-                for repo in self.yumbase.repos.listEnabled():
++            for repo in self.yumbase.repos.listEnabled():
++                if hasattr(repo, attrname):
+                     setattr(repo, attrname, only_trusted)
+ 
+ 
+-- 
+1.7.7.6
+
diff --git a/PackageKit.spec b/PackageKit.spec
index 3035898..8e7b515 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -3,7 +3,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.6.21
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -467,6 +467,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Apr 02 2012 Nils Philippsen <nils at redhat.com> - 0.6.21-3
+- yum: fix regression introduced by the fix-trusted-packages patch
+
 * Mon Jan 09 2012 Nils Philippsen <nils at redhat.com> - 0.6.21-2
 - yum: don't request authorization for trusted packages (#771746)