[Python-apps-commits] r10272 - in packages/kupfer/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Thursday, December 19, 2013 @ 20:12:58
  Author: dktrkranz
Revision: 10272

Fix crash with locales not supporting dot as decimal point separator

Added:
  packages/kupfer/trunk/debian/patches/locales.patch
Modified:
  packages/kupfer/trunk/debian/changelog
  packages/kupfer/trunk/debian/patches/series
  packages/kupfer/trunk/debian/patches/tracker-needle.patch

Modified: packages/kupfer/trunk/debian/changelog
===================================================================
--- packages/kupfer/trunk/debian/changelog	2013-12-19 20:08:06 UTC (rev 10271)
+++ packages/kupfer/trunk/debian/changelog	2013-12-19 20:12:58 UTC (rev 10272)
@@ -4,6 +4,9 @@
   * debian/patches/help.patch:
     - Workaround missing xml file, which prevents documentation from
       being loaded (Closes: #679296).
+  * debian/patches/locales.patch:
+    - Fix crash with locales not supporting dot as decimal point
+      separator (Closes: #680008).
   * debian/patches/tracker-needle.patch:
     - Spawn tracker-needle instead of tracker-search-tool (Closes: #680003).
   * debian/control:

Added: packages/kupfer/trunk/debian/patches/locales.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/locales.patch	                        (rev 0)
+++ packages/kupfer/trunk/debian/patches/locales.patch	2013-12-19 20:12:58 UTC (rev 10272)
@@ -0,0 +1,48 @@
+Description: Fix crash with locales not supporting dot as decimal point separator
+Author: Petr Gajdůšek <gajdusek.petr at centrum.cz>
+Forwarded: https://launchpad.net/kupfer/+bug/1082469
+
+Index: kupfer-0+v208/kupfer/plugin/top.py
+===================================================================
+--- kupfer-0+v208.orig/kupfer/plugin/top.py	2013-12-19 21:09:06.671859627 +0100
++++ kupfer-0+v208/kupfer/plugin/top.py	2013-12-19 21:09:16.527859929 +0100
+@@ -126,7 +126,7 @@
+ 	def _async_top_start(self):
+ 		uid = os.getuid()
+ 		utils.AsyncCommand(["top", "-b", "-n", "1", "-u", "%d" % uid],
+-		                   self._async_top_finished, 60)
++		                   self._async_top_finished, 60, env=["LC_NUMERIC=C"])
+ 
+ 	def get_items(self):
+ 		for task in self._cache:
+Index: kupfer-0+v208/kupfer/utils.py
+===================================================================
+--- kupfer-0+v208.orig/kupfer/utils.py	2013-12-19 21:09:06.671859627 +0100
++++ kupfer-0+v208/kupfer/utils.py	2013-12-19 21:09:16.527859929 +0100
+@@ -96,6 +96,8 @@
+ 
+ 	If stdin is a byte string, it is supplied on the command's stdin.
+ 
++	If env is None, command will inherit the parent's environment.
++
+ 	finish_callback -> (AsyncCommand, stdout_output, stderr_output)
+ 
+ 	Attributes:
+@@ -106,7 +108,7 @@
+ 	# the maximum input (bytes) we'll read in one shot (one io_callback)
+ 	max_input_buf = 512 * 1024
+ 
+-	def __init__(self, argv, finish_callback, timeout_s, stdin=None):
++	def __init__(self, argv, finish_callback, timeout_s, stdin=None, env=None):
+ 		self.stdout = []
+ 		self.stderr = []
+ 		self.stdin = []
+@@ -121,7 +123,7 @@
+ 		flags = (glib.SPAWN_SEARCH_PATH | glib.SPAWN_DO_NOT_REAP_CHILD)
+ 		pid, stdin_fd, stdout_fd, stderr_fd = \
+ 		     glib.spawn_async(argv, standard_output=True, standard_input=True,
+-		                      standard_error=True, flags=flags)
++		                      standard_error=True, flags=flags, envp=env)
+ 
+ 		if stdin:
+ 			self.stdin[:] = self._split_string(stdin, self.max_input_buf)

Modified: packages/kupfer/trunk/debian/patches/series
===================================================================
--- packages/kupfer/trunk/debian/patches/series	2013-12-19 20:08:06 UTC (rev 10271)
+++ packages/kupfer/trunk/debian/patches/series	2013-12-19 20:12:58 UTC (rev 10272)
@@ -2,3 +2,4 @@
 keyring-3.patch
 help.patch
 tracker-needle.patch
+locales.patch

Modified: packages/kupfer/trunk/debian/patches/tracker-needle.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/tracker-needle.patch	2013-12-19 20:08:06 UTC (rev 10271)
+++ packages/kupfer/trunk/debian/patches/tracker-needle.patch	2013-12-19 20:12:58 UTC (rev 10272)
@@ -1,5 +1,5 @@
 Description: Spawn tracker-needle instead of tracker-search-tool
-Author: Luca Falavigna <dktrkranz at debian.org>
+Author: Petr Gajdůšek <gajdusek.petr at centrum.cz>
 Forwarded: https://launchpad.net/kupfer/+bug/1082467
 
 Index: kupfer-0+v208/kupfer/plugin/tracker1.py