commit system-config-printer for openSUSE:Factory
Hello community, here is the log from the commit of package system-config-printer for openSUSE:Factory checked in at 2014-11-05 16:26:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old) and /work/SRC/openSUSE:Factory/.system-config-printer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "system-config-printer" Changes: -------- --- /work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes 2014-09-30 19:36:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes 2014-11-05 16:26:26.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Oct 24 11:07:49 UTC 2014 - dimstar@opensuse.org + +- Update system-config-printer-no-openprinting.patch: do not crash + when printing a traceback. As we disable openprinting, our + status is always 403 and the noise of a traceback not welcome + (boo#902407). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer-no-applet-in-gnome.patch ++++++ --- /var/tmp/diff_new_pack.D7PPsr/_old 2014-11-05 16:26:27.000000000 +0100 +++ /var/tmp/diff_new_pack.D7PPsr/_new 2014-11-05 16:26:27.000000000 +0100 @@ -1,7 +1,7 @@ -Index: system-config-printer-1.4.4/print-applet.desktop.in +Index: system-config-printer-1.4.5/print-applet.desktop.in =================================================================== ---- system-config-printer-1.4.4.orig/print-applet.desktop.in -+++ system-config-printer-1.4.4/print-applet.desktop.in +--- system-config-printer-1.4.5.orig/print-applet.desktop.in ++++ system-config-printer-1.4.5/print-applet.desktop.in @@ -5,6 +5,6 @@ Exec=system-config-printer-applet Terminal=false Type=Application ++++++ system-config-printer-no-openprinting.patch ++++++ --- /var/tmp/diff_new_pack.D7PPsr/_old 2014-11-05 16:26:27.000000000 +0100 +++ /var/tmp/diff_new_pack.D7PPsr/_new 2014-11-05 16:26:27.000000000 +0100 @@ -1,8 +1,8 @@ -Index: system-config-printer-1.4.0/cupshelpers/openprinting.py +Index: system-config-printer-1.4.5/cupshelpers/openprinting.py =================================================================== ---- system-config-printer-1.4.0.orig/cupshelpers/openprinting.py -+++ system-config-printer-1.4.0/cupshelpers/openprinting.py -@@ -48,6 +48,11 @@ class _QueryThread (threading.Thread): +--- system-config-printer-1.4.5.orig/cupshelpers/openprinting.py ++++ system-config-printer-1.4.5/cupshelpers/openprinting.py +@@ -49,6 +49,11 @@ class _QueryThread (threading.Thread): def run (self): @@ -14,7 +14,7 @@ # Callback function for pycURL collecting the data coming from # the web server def collect_data(result): -@@ -82,6 +87,7 @@ class _QueryThread (threading.Thread): +@@ -83,6 +88,7 @@ class _QueryThread (threading.Thread): self.result = sys.exc_info () if status == None: status = 0 @@ -22,11 +22,11 @@ if self.callback != None: self.callback (status, self.user_data, self.result) -Index: system-config-printer-1.4.0/newprinter.py +Index: system-config-printer-1.4.5/newprinter.py =================================================================== ---- system-config-printer-1.4.0.orig/newprinter.py -+++ system-config-printer-1.4.0/newprinter.py -@@ -424,6 +424,8 @@ class NewPrinterGUI(GtkGUI): +--- system-config-printer-1.4.5.orig/newprinter.py ++++ system-config-printer-1.4.5/newprinter.py +@@ -427,6 +427,8 @@ class NewPrinterGUI(GtkGUI): # Set up OpenPrinting widgets. self.openprinting = cupshelpers.openprinting.OpenPrinting () self.openprinting_query_handle = None @@ -35,7 +35,7 @@ combobox = self.cmbNPDownloadableDriverFoundPrinters cell = Gtk.CellRendererText() combobox.pack_start (cell, True) -@@ -1537,6 +1539,7 @@ class NewPrinterGUI(GtkGUI): +@@ -1598,6 +1600,7 @@ class NewPrinterGUI(GtkGUI): self.btnNPBack.hide() self.btnNPForward.show() downloadable_selected = False @@ -43,7 +43,22 @@ if self.rbtnNPDownloadableDriverSearch.get_active (): combobox = self.cmbNPDownloadableDriverFoundPrinters iter = combobox.get_active_iter () -@@ -3717,6 +3720,8 @@ class NewPrinterGUI(GtkGUI): +@@ -3257,11 +3260,12 @@ class NewPrinterGUI(GtkGUI): + self.cmbNPDownloadableDriverFoundPrinters.set_sensitive (False) + + def openprinting_printers_found (self, status, user_data, printers): +- if status != 0: ++ # as openSUSE disables openprinting support, we always return status 403 - forbidden ++ if status != 0 and status != 403: + # Should report error. + print "HTTP Status %d" % status + print printers +- print traceback.extract_tb(printers[2], limit=None) ++ # print traceback.extract_tb(printers[2], limit=None) + self.downloadable_printers = [] + self.openprinting_drivers_found () + return +@@ -3826,6 +3830,8 @@ class NewPrinterGUI(GtkGUI): elif self.rbtnNPPPD.get_active(): ppd = cups.PPD(self.filechooserPPD.get_filename()) else: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de