rpms/system-config-printer/F-11 system-config-printer-npinit-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.321, 1.322
Tim Waugh
twaugh at fedoraproject.org
Wed Jan 6 15:41:49 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6813
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-npinit-traceback.patch
Log Message:
* Wed Jan 6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
- Avoid traceback in NewPrinterGUI.init (bug #550442).
system-config-printer-npinit-traceback.patch:
system-config-printer.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE system-config-printer-npinit-traceback.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.npinit-traceback system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.npinit-traceback 2010-01-06 15:38:44.618286232 +0000
+++ system-config-printer-1.1.16/system-config-printer.py 2010-01-06 15:38:54.800408801 +0000
@@ -3974,7 +3974,7 @@ class NewPrinterGUI(GtkGUI):
self.auto_make = devid_dict["MFG"]
self.auto_model = devid_dict["MDL"]
self.auto_driver = None
- if not self.device or not self.device.id:
+ if self.device and not self.device.id:
self.device.id = devid
self.device.id_dict = cupshelpers.parseDeviceID (devid)
self.mainapp.devid = ""
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- system-config-printer.spec 6 Jan 2010 15:30:39 -0000 1.321
+++ system-config-printer.spec 6 Jan 2010 15:41:49 -0000 1.322
@@ -19,6 +19,7 @@ Patch1: system-config-printer-typo.patch
Patch2: system-config-printer-driver-pre-selection.patch
Patch3: system-config-printer-foomatic-recommended.patch
Patch4: system-config-printer-jobviewer-exit.patch
+Patch5: system-config-printer-npinit-traceback.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -71,6 +72,7 @@ the configuration tool.
%patch2 -p1 -b .driver-pre-selection
%patch3 -p1 -b .foomatic-recommended
%patch4 -p1 -b .jobviewer-exit
+%patch5 -p1 -b .npinit-traceback
%build
%configure
@@ -178,6 +180,7 @@ exit 0
%changelog
* Wed Jan 6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
+- Avoid traceback in NewPrinterGUI.init (bug #550442).
- Avoid traceback in on_jobviewer_exit (bug #550437).
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1.1.16-2
More information about the fedora-extras-commits
mailing list