rpms/system-config-printer/F-13 system-config-printer-cdi-no-drivers.patch, NONE, 1.1 system-config-printer.spec, 1.370, 1.371
Tim Waugh
twaugh at fedoraproject.org
Thu Mar 18 16:49:47 UTC 2010
- Previous message: rpms/media-player-info/F-12 .cvsignore, 1.2, 1.3 media-player-info.spec, 1.1, 1.2 sources, 1.2, 1.3 import.log, 1.1, NONE
- Next message: rpms/selinux-policy/F-12 policy-20100106.patch, 1.52, 1.53 selinux-policy.spec, 1.1037, 1.1038
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8110
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-cdi-no-drivers.patch
Log Message:
* Thu Mar 18 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-2
- Fixed traceback in check-driver-ids.py when no drivers are found
(bug #574827).
system-config-printer-cdi-no-drivers.patch:
check-device-ids.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE system-config-printer-cdi-no-drivers.patch ---
diff -up system-config-printer-1.2.0/check-device-ids.py.cdi-no-drivers system-config-printer-1.2.0/check-device-ids.py
--- system-config-printer-1.2.0/check-device-ids.py.cdi-no-drivers 2010-03-17 14:20:35.000000000 +0000
+++ system-config-printer-1.2.0/check-device-ids.py 2010-03-18 16:29:56.065865306 +0000
@@ -167,7 +167,7 @@ for device, attrs in devices.iteritems (
try:
drivers = ppds.ids[id_fields['MFG'].lower ()][id_fields['MDL'].lower ()]
except KeyError:
- drivers = None
+ drivers = []
if i < n:
more = unichr (0x2502)
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-13/system-config-printer.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -p -r1.370 -r1.371
--- system-config-printer.spec 17 Mar 2010 15:40:59 -0000 1.370
+++ system-config-printer.spec 18 Mar 2010 16:49:46 -0000 1.371
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -19,6 +19,7 @@ Source2: http://cyberelk.net/tim/data/py
Patch1: system-config-printer-no-epydoc.patch
Patch2: system-config-printer-lowercase-mfg-mdl.patch
+Patch3: system-config-printer-cdi-no-drivers.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -83,6 +84,10 @@ printers.
# Convert InstallPrinterDriver requests to lower-case.
%patch2 -p1 -b .lowercase-mfg-mdl
+# Fixed traceback in check-driver-ids.py when no drivers are found
+# (bug #574827).
+%patch3 -p1 -b .cdi-no-drivers
+
%build
%configure --with-udev-rules
@@ -198,6 +203,10 @@ rm -rf %buildroot
exit 0
%changelog
+* Thu Mar 18 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-2
+- Fixed traceback in check-driver-ids.py when no drivers are found
+ (bug #574827).
+
* Wed Mar 17 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-1
- Updated to pycups-1.9.49.
- 1.2.0:
- Previous message: rpms/media-player-info/F-12 .cvsignore, 1.2, 1.3 media-player-info.spec, 1.1, 1.2 sources, 1.2, 1.3 import.log, 1.1, NONE
- Next message: rpms/selinux-policy/F-12 policy-20100106.patch, 1.52, 1.53 selinux-policy.spec, 1.1037, 1.1038
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list