From f9d87832e462b9d69d49c4826d70d0e48339e37d Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Sep 16 2008 18:32:34 +0000 Subject: - Fix an error where we didn't connect up the GetDistroUpgrades in the new dispatcher code. --- diff --git a/PackageKit.spec b/PackageKit.spec index 1135d20..0c559e9 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -8,13 +8,16 @@ Summary: System daemon that is a DBUS abstraction layer for package management Name: PackageKit Version: 0.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# upstream: 51b020dca500141a6e78ab549765f09a34ac75fc +Patch0: pk-upgrades-mistake.patch + Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: PackageKit-libs = %{version}-%{release} @@ -139,6 +142,7 @@ using PackageKit. %prep %setup -q +%patch0 -p1 %build %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local @@ -269,6 +273,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_includedir}/* %changelog +* Tue Sep 16 2008 Richard Hughes - 0.3.3-2 +- Fix an error where we didn't connect up the GetDistroUpgrades in + the new dispatcher code. + * Tue Sep 16 2008 Richard Hughes - 0.3.3-1 - New upstream version - Fixes a nasty bug where the daemon could get locked under heavy load diff --git a/pk-upgrades-mistake.patch b/pk-upgrades-mistake.patch new file mode 100644 index 0000000..caee0dc --- /dev/null +++ b/pk-upgrades-mistake.patch @@ -0,0 +1,34 @@ +commit 51b020dca500141a6e78ab549765f09a34ac75fc +Author: Richard Hughes +Date: Tue Sep 16 19:07:39 2008 +0100 + + yum: hook up get-distro-upgrades in the dispatcher, and make sure we send a proper error in this case + +diff --git a/python/packagekit/backend.py b/python/packagekit/backend.py +index 09fd1da..87abaa7 100644 +--- a/python/packagekit/backend.py ++++ b/python/packagekit/backend.py +@@ -468,6 +468,9 @@ class PackageKitBaseBackend: + pkgs = args[0].split('|') + self.get_update_detail(pkgs) + self.finished(); ++ elif cmd == 'get-distro-upgrades': ++ self.get_distro_upgrades() ++ self.finished(); + elif cmd == 'get-updates': + filters = args[0] + self.get_updates(filters) +@@ -549,9 +552,9 @@ class PackageKitBaseBackend: + self.what_provides(filters,provides_type,search) + self.finished(); + else: +- print "command [%s] is not known" % cmd +- +- ++ errmsg = "command '%s' is not known" % cmd ++ self.error(ERROR_INTERNAL_ERROR,errmsg,exit=False) ++ self.finished(); + + def exceptionHandler(typ,value,tb,base): + # Restore original exception handler +