[Python-apps-commits] r4853 - in packages/ibid/trunk/debian/patches (separate-data.diff)

[stefanor-guest at users.alioth.debian.org]

    Date: Wednesday, February 24, 2010 @ 13:36:43
  Author: stefanor-guest
Revision: 4853

Update patches

Modified:
  packages/ibid/trunk/debian/patches/separate-data.diff

Modified: packages/ibid/trunk/debian/patches/separate-data.diff
===================================================================
--- packages/ibid/trunk/debian/patches/separate-data.diff	2010-02-24 13:29:59 UTC (rev 4852)
+++ packages/ibid/trunk/debian/patches/separate-data.diff	2010-02-24 13:36:43 UTC (rev 4853)
@@ -23,15 +23,15 @@
  include COPYING
 --- a/ibid/utils/__init__.py
 +++ b/ibid/utils/__init__.py
-@@ -17,7 +17,6 @@
- import zlib
+@@ -18,7 +18,6 @@
+ from subprocess import Popen, PIPE
  
  from dateutil.tz import tzlocal, tzutc
 -from pkg_resources import resource_exists, resource_filename
  
  import ibid
  from ibid.compat import defaultdict, json
-@@ -236,8 +235,10 @@
+@@ -237,9 +236,11 @@
      ))
      if os.path.exists(fspath):
          return fspath
@@ -43,7 +43,8 @@
 -    return resource_filename(path, filename)
 +    return debianpath
  
- # vi: set et sta sw=4 ts=4:
+ def get_process_output(command, input=None):
+     process = Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE)
 --- a/scripts/ibid-setup
 +++ b/scripts/ibid-setup
 @@ -8,10 +8,16 @@