rpms/PackageKit/F-10 PackageKit-0.3.11-catch-yumcomps.patch, NONE, 1.1 PackageKit-0.3.11-comps-add-more.patch, NONE, 1.1 PackageKit-0.3.11-small-memory-leak.patch, NONE, 1.1 PackageKit.spec, 1.85, 1.86

Richard Hughes rhughes at fedoraproject.org
Mon Dec 1 12:52:19 UTC 2008


Author: rhughes

Update of /cvs/pkgs/rpms/PackageKit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18395

Modified Files:
	PackageKit.spec 
Added Files:
	PackageKit-0.3.11-catch-yumcomps.patch 
	PackageKit-0.3.11-comps-add-more.patch 
	PackageKit-0.3.11-small-memory-leak.patch 
Log Message:
* Mon Dec 01 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-3
- Catch errors from yum when getting the comps groups
- Add some more groups to the simple comps group mapping table
- Fix a small memory leak (~20 bytes) when getting authorisations


PackageKit-0.3.11-catch-yumcomps.patch:

--- NEW FILE PackageKit-0.3.11-catch-yumcomps.patch ---
commit 6581e0ac0a21414e702b353462941df31ccbe2f1
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 09:41:42 2008 +0000

    yum: catch yum.Errors.RepoError when we get the yum comps groups. Fixes fd#18722

diff --git a/backends/yum/yumComps.py b/backends/yum/yumComps.py
index 3d40391..fedc171 100755
--- a/backends/yum/yumComps.py
+++ b/backends/yum/yumComps.py
@@ -255,8 +255,10 @@ class yumComps:
 
     def refresh(self, force=False):
         ''' get the data from yum (slow, REALLY SLOW) '''
-
-        cats = self.yumbase.comps.categories
+        try:
+            cats = self.yumbase.comps.categories
+        except yum.Errors.RepoError, e:
+            return False
         if self.yumbase.comps.compscount == 0:
             return False
 

PackageKit-0.3.11-comps-add-more.patch:

--- NEW FILE PackageKit-0.3.11-comps-add-more.patch ---
commit 2d54e2533a5fb94531a80d6ed31b625657896d0e
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 14:28:35 2008 +0000

    yum: add a few more entries into the comps groups mapping

diff --git a/backends/yum/yumComps.py b/backends/yum/yumComps.py
index 044bc86..3d40391 100755
--- a/backends/yum/yumComps.py
+++ b/backends/yum/yumComps.py
@@ -26,6 +26,7 @@ groupMap = {
 'desktops;gnome-desktop'                      : GROUP_DESKTOP_GNOME,
 'desktops;window-managers'                    : GROUP_DESKTOP_OTHER,
 'desktops;sugar-desktop'                      : GROUP_DESKTOP_OTHER,
+'desktops;lxde-desktop'                       : GROUP_DESKTOP_OTHER,
 'desktops;kde-desktop'                        : GROUP_DESKTOP_KDE,
 'desktops;xfce-desktop'                       : GROUP_DESKTOP_XFCE,
 'apps;authoring-and-publishing'               : GROUP_PUBLISHING,
@@ -38,6 +39,7 @@ groupMap = {
 'apps;text-internet'                          : GROUP_INTERNET,
 'apps;graphical-internet'                     : GROUP_INTERNET,
 'apps;education'                              : GROUP_EDUCATION,
+'development;haskell'                         : GROUP_PROGRAMMING,
 'development;kde-software-development'        : GROUP_PROGRAMMING,
 'development;gnome-software-development'      : GROUP_PROGRAMMING,
 'development;development-tools'               : GROUP_PROGRAMMING,
@@ -63,6 +65,7 @@ groupMap = {
 'servers;mail-server'                         : GROUP_SERVERS,
 'servers;network-server'                      : GROUP_SERVERS,
 'servers;legacy-network-server'               : GROUP_SERVERS,
+'base-system;input-methods'                   : GROUP_LOCALIZATION,
 'base-system;java'                            : GROUP_SYSTEM,
 'base-system;base-x'                          : GROUP_SYSTEM,
 'base-system;system-tools'                    : GROUP_ADMIN_TOOLS,
@@ -169,6 +172,13 @@ groupMap = {
 'language-support;macedonian-support'         : GROUP_LOCALIZATION,
 'language-support;walloon-support'            : GROUP_LOCALIZATION,
 'language-support;kashubian-support'          : GROUP_LOCALIZATION,
+'language-support;kashmiri-support'           : GROUP_LOCALIZATION,
+'language-support;konkani-support'            : GROUP_LOCALIZATION,
+'language-support;tajik-support'              : GROUP_LOCALIZATION,
+'language-support;sindhi-support'             : GROUP_LOCALIZATION,
+'language-support;uzbek-support'              : GROUP_LOCALIZATION,
+'language-support;burmese-support'            : GROUP_LOCALIZATION,
+'language-support;maithili-support'           : GROUP_LOCALIZATION,
 'rpmfusion_free;kde-desktop'                  : GROUP_DESKTOP_KDE,
 'rpmfusion_free;misc-libs'                    : GROUP_OTHER,
 'rpmfusion_free;games'                        : GROUP_GAMES,

PackageKit-0.3.11-small-memory-leak.patch:

--- NEW FILE PackageKit-0.3.11-small-memory-leak.patch ---
commit dcd2c4d4f78678b76e1937598c05b94c65a07faa
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Nov 25 10:03:22 2008 +0000

    bugfix: fix a small memory leak in pk_transaction_action_is_allowed()

diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 282b38d..40b370d 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -1405,8 +1405,10 @@ pk_transaction_action_is_allowed (PkTransaction *transaction, gboolean trusted,
 
 	/* use security model to get auth */
 	ret = pk_security_action_is_allowed (transaction->priv->security, transaction->priv->caller, trusted, role, &error_detail);
-	if (!ret)
+	if (!ret) {
 		*error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_REFUSED_BY_POLICY, "%s", error_detail);
+		g_free (error_detail);
+	}
 	return ret;
 }
 


Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/F-10/PackageKit.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- PackageKit.spec	28 Nov 2008 11:23:06 -0000	1.85
+++ PackageKit.spec	1 Dec 2008 12:51:49 -0000	1.86
@@ -8,7 +8,7 @@
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.3.11
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -19,6 +19,15 @@
 # Set Vendor.conf up for Fedora.
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 
+# from git, 6581e0ac0a21414e702b353462941df31ccbe2f1
+Patch1:    PackageKit-0.3.11-catch-yumcomps.patch
+
+# from git, 2d54e2533a5fb94531a80d6ed31b625657896d0e
+Patch2:    PackageKit-0.3.11-comps-add-more.patch
+
+# from git, dcd2c4d4f78678b76e1937598c05b94c65a07faa
+Patch3:    PackageKit-0.3.11-small-memory-leak.patch
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
@@ -200,6 +209,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -379,6 +391,11 @@
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
+* Mon Dec 01 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-3
+- Catch errors from yum when getting the comps groups
+- Add some more groups to the simple comps group mapping table
+- Fix a small memory leak (~20 bytes) when getting authorisations
+
 * Fri Nov 28 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.11-2
 - Rebuild because Bodhi hates me.
 




More information about the fedora-extras-commits mailing list