rpms/system-config-printer/F-11 system-config-printer-copy-crash.patch, 1.1, 1.2 system-config-printer.spec, 1.330, 1.331

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer-copy-crash.patch 
	system-config-printer.spec 
Log Message:
* Mon Jan 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-8
- Fixed traceback when copying printer with certain job options
  set (bug #554268).


system-config-printer-copy-crash.patch:
 options.py               |   13 ++++++++++---
 system-config-printer.py |    4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

Index: system-config-printer-copy-crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer-copy-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-copy-crash.patch	11 Jan 2010 15:59:41 -0000	1.1
+++ system-config-printer-copy-crash.patch	11 Jan 2010 16:08:28 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up system-config-printer-1.1.16/options.py.copy-crash system-config-printer-1.1.16/options.py
 --- system-config-printer-1.1.16/options.py.copy-crash	2009-12-22 14:44:19.000000000 +0000
-+++ system-config-printer-1.1.16/options.py	2010-01-11 15:52:50.581036024 +0000
++++ system-config-printer-1.1.16/options.py	2010-01-11 16:05:04.352909594 +0000
 @@ -1,8 +1,9 @@
  ## system-config-printer
  
@@ -35,13 +35,11 @@ diff -up system-config-printer-1.1.16/op
          # For the media option, the system default depends on the printer's
          # PageSize setting.  This method allows the main module to tell us
 diff -up system-config-printer-1.1.16/system-config-printer.py.copy-crash system-config-printer-1.1.16/system-config-printer.py
---- system-config-printer-1.1.16/system-config-printer.py.copy-crash	2010-01-11 15:52:42.178911479 +0000
-+++ system-config-printer-1.1.16/system-config-printer.py	2010-01-11 15:52:50.589911263 +0000
-@@ -2068,9 +2068,10 @@ class GUI(GtkGUI, monitor.Watcher):
-                 if option not in self.server_side_options:
+--- system-config-printer-1.1.16/system-config-printer.py.copy-crash	2010-01-11 16:05:04.342910797 +0000
++++ system-config-printer-1.1.16/system-config-printer.py	2010-01-11 16:05:22.957910696 +0000
+@@ -2069,8 +2069,8 @@ class GUI(GtkGUI, monitor.Watcher):
                      printer.unsetOption(option)
              for option in self.server_side_options.itervalues():
-+                print option.name, option.is_changed(), saveall
                  if (option.is_changed() or
 -                    saveall and
 -                    option.get_current_value () != option.system_default):


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -p -r1.330 -r1.331
--- system-config-printer.spec	11 Jan 2010 15:59:41 -0000	1.330
+++ system-config-printer.spec	11 Jan 2010 16:08:28 -0000	1.331
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -195,7 +195,7 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Mon Jan 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-7
+* Mon Jan 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-8
 - Fixed traceback when copying printer with certain job options
   set (bug #554268).