From c26f0f21adfbedff8f40d947c3fc0bc668ac586e Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Sep 23 2008 13:50:10 +0000 Subject: - Fix the error dialog when no mirrors are found --- diff --git a/PackageKit.spec b/PackageKit.spec index 4ad4121..83ec16c 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -8,7 +8,7 @@ Summary: System daemon that is a DBUS abstraction layer for package management Name: PackageKit Version: 0.3.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://packagekit.freedesktop.org @@ -21,6 +21,9 @@ Patch0: pk-dont-send-finished-from-dispatcher.patch # upstream: 95a2dcf78ba0e2ae6262bfae897a16b0e26408c8 Patch1: pk-dont-schedule-the-whole-queue.patch +# upstream: 16bea44b16fd8b1ac36cc5939caf1017eece12eb +Patch2: pk-fix-yum-error-name.patch + Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: PackageKit-libs = %{version}-%{release} @@ -147,6 +150,7 @@ using PackageKit. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local @@ -277,6 +281,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_includedir}/* %changelog +* Tue Sep 23 2008 Richard Hughes - 0.3.4-4 +- Fix the error dialog when no mirrors are found + * Tue Sep 23 2008 Richard Hughes - 0.3.4-3 - Don't try to run all the committed transactions at once with a deep queue. - This fixes the bug where the dispatcher would sometimes fail to run the diff --git a/pk-fix-yum-error-name.patch b/pk-fix-yum-error-name.patch new file mode 100644 index 0000000..3821225 --- /dev/null +++ b/pk-fix-yum-error-name.patch @@ -0,0 +1,19 @@ +commit 16bea44b16fd8b1ac36cc5939caf1017eece12eb +Author: Richard Hughes +Date: Tue Sep 23 14:43:31 2008 +0100 + + yum: fix the name of the enum when no mirrors are found + +diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py +index b445e0d..8a29917 100755 +--- a/backends/yum/yumBackend.py ++++ b/backends/yum/yumBackend.py +@@ -915,7 +915,7 @@ class PackageKitYumBackend(PackageKitBaseBackend,PackagekitPackage): + except yum.Errors.RepoError,e: + message = self._format_msgs(e.value) + if message.find ("No more mirrors to try") != -1: +- self.error(ERROR_FILE_NO_MORE_MIRRORS_TO_TRY,message) ++ self.error(ERROR_NO_MORE_MIRRORS_TO_TRY,message) + else: + self.error(ERROR_REPO_CONFIGURATION_ERROR,message) + except yum.Errors.YumBaseError,e: