r43747 - in /attic/system-config-printer/debian: changelog control control.in patches/0008-return-exception-rather-than-looping.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Wed Oct 22 23:29:11 UTC 2014
Author: bigon
Date: Wed Oct 22 23:29:11 2014
New Revision: 43747
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43747
Log:
* d/p/0008-return-exception-rather-than-looping.patch: This patch should fix
the infinite loop creating million of symlinks in /tmp (Closes: #764253)
* debian/control.in: Suggest gnome-packagekit-session instead of
sessioninstaller (Closes: #623013)
Added:
attic/system-config-printer/debian/patches/0008-return-exception-rather-than-looping.patch
Modified:
attic/system-config-printer/debian/changelog
attic/system-config-printer/debian/control
attic/system-config-printer/debian/control.in
attic/system-config-printer/debian/patches/series
Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=43747&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog [utf-8] (original)
+++ attic/system-config-printer/debian/changelog [utf-8] Wed Oct 22 23:29:11 2014
@@ -20,8 +20,12 @@
* Add debian/patches/0007-fix-pk-package-name.patch: Fix the package names
that PackageKit should try to install
* debian/system-config-printer.install: Install appdata file
-
- -- Laurent Bigonville <bigon at debian.org> Wed, 22 Oct 2014 21:14:30 +0200
+ * d/p/0008-return-exception-rather-than-looping.patch: This patch should fix
+ the infinite loop creating million of symlinks in /tmp (Closes: #764253)
+ * debian/control.in: Suggest gnome-packagekit-session instead of
+ sessioninstaller (Closes: #623013)
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 23 Oct 2014 01:27:20 +0200
system-config-printer (1.4.3-4) unstable; urgency=medium
Modified: attic/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control?rev=43747&op=diff
==============================================================================
--- attic/system-config-printer/debian/control [utf-8] (original)
+++ attic/system-config-printer/debian/control [utf-8] Wed Oct 22 23:29:11 2014
@@ -49,7 +49,7 @@
cups-pk-helper,
gir1.2-gnomekeyring-1.0,
python-smbc
-Suggests: sessioninstaller
+Suggests: gnome-packagekit-session
Conflicts: hal-cups-utils
Description: graphical interface to configure the printing system
System-config-printer is a GUI written in Python using GTK+ to
Modified: attic/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control.in?rev=43747&op=diff
==============================================================================
--- attic/system-config-printer/debian/control.in [utf-8] (original)
+++ attic/system-config-printer/debian/control.in [utf-8] Wed Oct 22 23:29:11 2014
@@ -45,7 +45,7 @@
cups-pk-helper,
gir1.2-gnomekeyring-1.0,
python-smbc
-Suggests: sessioninstaller
+Suggests: gnome-packagekit-session
Conflicts: hal-cups-utils
Description: graphical interface to configure the printing system
System-config-printer is a GUI written in Python using GTK+ to
Added: attic/system-config-printer/debian/patches/0008-return-exception-rather-than-looping.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0008-return-exception-rather-than-looping.patch?rev=43747&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0008-return-exception-rather-than-looping.patch (added)
+++ attic/system-config-printer/debian/patches/0008-return-exception-rather-than-looping.patch [utf-8] Wed Oct 22 23:29:11 2014
@@ -0,0 +1,61 @@
+From 9a81dd1de3afaf30eec92045429029103823b577 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Wed, 22 Oct 2014 12:51:48 +0100
+Subject: ppdcache: return exception rather than looping.
+
+
+diff --git a/ppdcache.py b/ppdcache.py
+index 6c54e77..a9ba499 100644
+--- a/ppdcache.py
++++ b/ppdcache.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/python
+
+-## Copyright (C) 2010, 2011, 2012, 2013 Red Hat, Inc.
++## Copyright (C) 2010, 2011, 2012, 2013, 2014 Red Hat, Inc.
+ ## Authors:
+ ## Tim Waugh <twaugh at redhat.com>
+
+@@ -107,14 +107,20 @@ class PPDCache:
+
+ def _got_ppd (self, connection, name, result, callback):
+ if isinstance (result, Exception):
+- self._schedule_callback (callback, name, result, None)
++ self._schedule_callback (callback, name, none, result)
+ else:
+ # Store an open file object, then remove the actual file.
+ # This way we don't leave temporary files around.
+- self._cache[name] = file (result)
+- debugprint ("%s: caching %s (fd %d)" % (self, result,
+- self._cache[name].fileno()))
+- os.unlink (result)
++ try:
++ self._cache[name] = file (result)
++ debugprint ("%s: caching %s (fd %d)" %
++ (self, result,
++ self._cache[name].fileno()))
++ os.unlink (result)
++ except IOError as exc:
++ self._schedule_callback (callback, name, None, exc)
++ return
++
+ self.fetch_ppd (name, callback)
+
+ def _got_ppd3 (self, connection, name, result, callback):
+@@ -144,10 +150,12 @@ class PPDCache:
+ modtime, status))
+ os.unlink (filename)
+ self._modtimes[name] = modtime
+- except IOError:
++ except IOError as exc:
+ # File disappeared?
+ debugprint ("%s: file %s disappeared? Unable to cache it"
+ % (self, filename))
++ self._schedule_callback (callback, name, None, exc)
++ return
+
+ # Now fetch it from our own cache.
+ self.fetch_ppd (name, callback, check_uptodate=False)
+--
+cgit v0.10.2
+
Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=43747&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series [utf-8] (original)
+++ attic/system-config-printer/debian/patches/series [utf-8] Wed Oct 22 23:29:11 2014
@@ -4,3 +4,4 @@
#0005-Fix-French-translation.patch
0006-use-paper-size-default-in-etc-papersize.patch
0007-fix-pk-package-name.patch
+0008-return-exception-rather-than-looping.patch
More information about the pkg-gnome-commits
mailing list