r24486 - in /packages/unstable/meld/debian: changelog patches/series patches/vcs-crash.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jun  6 08:39:26 2010
New Revision: 24486

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24486
Log:
vcs-crash.patch: stolen upstream. Fix a crash when using CVS, svn or 
git. Closes: #584554.

Added:
    packages/unstable/meld/debian/patches/vcs-crash.patch
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/patches/series

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=24486&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog [utf-8] (original)
+++ packages/unstable/meld/debian/changelog [utf-8] Sun Jun  6 08:39:26 2010
@@ -1,6 +1,11 @@
 meld (1.3.1-2) UNRELEASED; urgency=low
 
+  [ Balint Reczey ]
   * run meld using /usr/bin/python instead of env python (Closes: #551189)
+
+  [ Josselin Mouette ]
+  * vcs-crash.patch: stolen upstream. Fix a crash when using CVS, svn or 
+    git. Closes: #584554.
 
  -- Balint Reczey <balint at balintreczey.hu>  Wed, 26 May 2010 21:35:34 +0200
 

Modified: packages/unstable/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/series?rev=24486&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/series [utf-8] (original)
+++ packages/unstable/meld/debian/patches/series [utf-8] Sun Jun  6 08:39:26 2010
@@ -1,2 +1,3 @@
 sourceview-package.patch
 python-path.patch
+vcs-crash.patch

Added: packages/unstable/meld/debian/patches/vcs-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/vcs-crash.patch?rev=24486&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/vcs-crash.patch (added)
+++ packages/unstable/meld/debian/patches/vcs-crash.patch [utf-8] Sun Jun  6 08:39:26 2010
@@ -1,0 +1,21 @@
+From aa9a506099627e1d62acbe6e7c09c217d86feef5 Mon Sep 17 00:00:00 2001
+From: Kai Willadsen <kai.willadsen at gmail.com>
+Date: Sun, 11 Oct 2009 00:18:21 +0000
+Subject: Don't pass empty cwd to subprocess (closes bgo#597718)
+
+---
+diff --git a/meld/misc.py b/meld/misc.py
+index a2cf71d..3a70e97 100644
+--- a/misc.py
++++ b/misc.py
+@@ -232,6 +232,8 @@ def read_pipe_iter(command, errorstream, yield_interval=0.1, workdir=None):
+             if status:
+                 errorstream.write("Exit code: %i\n" % status)
+             yield "".join(bits)
++    if workdir == "":
++        workdir = None
+     return sentinel()()
+ 
+ def write_pipe(command, text):
+--
+cgit v0.8.3.1