rpms/system-config-printer/F-11 system-config-printer-auth-no-pw.patch, NONE, 1.1 system-config-printer.spec, 1.327, 1.328
Tim Waugh
twaugh at fedoraproject.org
Thu Jan 7 15:48:28 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22238
Modified Files:
system-config-printer.spec
Added Files:
system-config-printer-auth-no-pw.patch
Log Message:
* Thu Jan 7 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-5
- Fixed crash when using keyring for auth without password (bug #553141).
system-config-printer-auth-no-pw.patch:
jobviewer.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE system-config-printer-auth-no-pw.patch ---
diff -up system-config-printer-1.1.16/jobviewer.py.auth-no-pw system-config-printer-1.1.16/jobviewer.py
--- system-config-printer-1.1.16/jobviewer.py.auth-no-pw 2009-12-22 14:44:19.000000000 +0000
+++ system-config-printer-1.1.16/jobviewer.py 2010-01-07 15:40:43.517049465 +0000
@@ -1,6 +1,6 @@
-## Copyright (C) 2007, 2008, 2009 Tim Waugh <twaugh at redhat.com>
-## Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
+## Copyright (C) 2007, 2008, 2009, 2010 Red Hat, Inc.
+## Author: Tim Waugh <twaugh at redhat.com>
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -599,13 +599,12 @@ class JobViewer (GtkGUI, monitor.Watcher
# Find out which auth-info is required.
try_keyring = USE_KEYRING
- keyring_attrs = None
+ keyring_attrs = dict()
auth_info = None
if try_keyring and 'password' in auth_info_required:
auth_info_required = data.get ('auth-info-required', [])
device_uri = data.get ("device-uri")
(scheme, rest) = urllib.splittype (device_uri)
- keyring_attrs = dict ()
if scheme == 'smb':
uri = smburi.SMBURI (uri=device_uri)
(group, server, share,
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- system-config-printer.spec 7 Jan 2010 13:07:34 -0000 1.327
+++ system-config-printer.spec 7 Jan 2010 15:48:28 -0000 1.328
@@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.16
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@@ -23,6 +23,7 @@ Patch5: system-config-printer-npinit-tra
Patch6: system-config-printer-notification-timeouts.patch
Patch7: system-config-printer-select-nonexistent-printer.patch
Patch8: system-config-printer-ink-levels.patch
+Patch9: system-config-printer-auth-no-pw.patch
Patch101: pycups-request-readio.patch
@@ -81,6 +82,7 @@ the configuration tool.
%patch6 -p1 -b .notification-timeouts
%patch7 -p1 -b .select-nonexistent-printer
%patch8 -p1 -b .ink-levels
+%patch9 -p1 -b .auth-no-pw
pushd pycups-%{pycups_version}
%patch101 -p1 -b .request-readio
@@ -192,6 +194,9 @@ exit 0
%changelog
* Thu Jan 7 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-5
+- Fixed crash when using keyring for auth without password (bug #553141).
+
+* Thu Jan 7 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-4
- Fixed typo introduced in recent fix (bug #551436).
- Use %%global instead of %%define.
More information about the fedora-extras-commits
mailing list