rpms/system-config-printer/F-11 system-config-printer-physdev-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.290, 1.291

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-physdev-traceback.patch 
Log Message:
* Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
- Avoid traceback in PhysicalDevice.py.


system-config-printer-physdev-traceback.patch:
 PhysicalDevice.py |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE system-config-printer-physdev-traceback.patch ---
diff -up system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback system-config-printer-1.1.13/PhysicalDevice.py
--- system-config-printer-1.1.13/PhysicalDevice.py.physdev-traceback	2009-09-01 12:08:33.000000000 +0100
+++ system-config-printer-1.1.13/PhysicalDevice.py	2009-09-30 16:52:24.486760364 +0100
@@ -48,6 +48,8 @@ class PhysicalDevice:
                     hostport = ipparam[3:]
                 else:
                     return None
+            else:
+                return None
         else:
             (hostport, rest) = urllib.splithost (rest)
             if hostport == None:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -p -r1.290 -r1.291
--- system-config-printer.spec	30 Sep 2009 15:51:56 -0000	1.290
+++ system-config-printer.spec	30 Sep 2009 15:53:44 -0000	1.291
@@ -20,6 +20,7 @@ Patch2: system-config-printer-cancel-tra
 Patch5: system-config-printer-fetchdevices.patch
 Patch6: system-config-printer-missing-import.patch
 Patch7: system-config-printer-find-return-accel.patch
+Patch8: system-config-printer-physdev-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -73,6 +74,7 @@ the configuration tool.
 %patch5 -p1 -b .fetchdevices
 %patch6 -p1 -b .missing-import
 %patch7 -p1 -b .find-return-accel
+%patch8 -p1 -b .physdev-traceback
 
 %build
 %configure
@@ -175,6 +177,7 @@ exit 0
 
 %changelog
 * Wed Sep 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-3
+- Avoid traceback in PhysicalDevice.py.
 - Let Return key activate the Find button for Find Network Printer.
 
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2