rpms/system-config-printer/F-12 system-config-printer-gpk-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.313, 1.314

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21592

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-gpk-traceback.patch 
Log Message:
* Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.13-11
- Prevent traceback when PackageKit is not installed (bug #540230).


system-config-printer-gpk-traceback.patch:
 system-config-printer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-gpk-traceback.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.gpk-traceback system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.gpk-traceback	2009-11-23 14:02:58.000000000 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-11-23 14:05:04.000000000 +0100
@@ -4316,9 +4316,9 @@ class NewPrinterGUI(GtkGUI):
                         debugprint ("foomatic-db-ppds already installed")
                     except OSError:
                         debugprint ("foomatic-db-ppds not yet installed")
-                        pk = installpackage.PackageKit ()
                         pid = None
                         try:
+                            pk = installpackage.PackageKit ()
                             xid = self.mainapp.PrintersWindow.window.xid
                             pk.InstallPackageName (xid, 0, "foomatic-db-ppds")
                         except:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -p -r1.313 -r1.314
--- system-config-printer.spec	11 Nov 2009 15:03:39 -0000	1.313
+++ system-config-printer.spec	23 Nov 2009 13:25:11 -0000	1.314
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -36,6 +36,7 @@ Patch18: system-config-printer-notificat
 Patch19: system-config-printer-de.po-typo.patch
 Patch20: system-config-printer-test-page-traceback.patch
 Patch21: system-config-printer-install-foomatic-db-ppds.patch
+Patch22: system-config-printer-gpk-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -116,6 +117,7 @@ printers.
 %patch19 -p1 -b .de.po-typo
 %patch20 -p1 -b .test-page-traceback
 %patch21 -p1 -b .install-foomatic-db-ppds
+%patch22 -p1 -b .gpk-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -227,6 +229,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Nov 23 2009 Jiri Popelka <jpopelka at redhat.com> 1.1.13-11
+- Prevent traceback when PackageKit is not installed (bug #540230).
+
 * Wed Nov 11 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-10
 - Suggest installing foomatic-db-ppds when appropriate (bug #536831).