[Python-modules-commits] r21260 - in packages/gamera/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Wednesday, April 18, 2012 @ 12:39:06
  Author: jwilk
Revision: 21260

Trap errors from pclose(3) in the test suite. Build-depend on procps.

Added:
  packages/gamera/trunk/debian/patches/trap-errors-from-pclose.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/control
  packages/gamera/trunk/debian/patches/series

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2012-04-17 21:01:38 UTC (rev 21259)
+++ packages/gamera/trunk/debian/changelog	2012-04-18 12:39:06 UTC (rev 21260)
@@ -19,8 +19,11 @@
       via PYTHONPATH.
     + Use xargs to iterate over all Python versions.
   * Run tests in override_dh_auto_test rather than in override_dh_auto_build.
+  * Trap errors from pclose(3) in the test suite.
+    (trap-errors-from-pclose.diff)
+  * Build-depend on procps, as ps(1) is needed for the test suite.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 16 Apr 2012 21:20:34 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Wed, 18 Apr 2012 14:38:21 +0200
 
 gamera (3.3.2-2) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control	2012-04-17 21:01:38 UTC (rev 21259)
+++ packages/gamera/trunk/debian/control	2012-04-18 12:39:06 UTC (rev 21260)
@@ -7,8 +7,8 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/gamera/trunk/
 Build-Depends: debhelper (>= 7.3.5~), dpkg-dev (>= 1.15.7~),
  python-support (>= 0.90), python-all-dev, python-all-dbg,
- python-nose,
- python-imaging, python-imaging-dbg, python-docutils, python-pygments,
+ python-nose, procps, python-docutils, python-pygments,
+ python-imaging, python-imaging-dbg,
  libtiff4-dev, libpng-dev,
  libvigraimpex-dev (>= 1.6.0-1~),
  libga-dev

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2012-04-17 21:01:38 UTC (rev 21259)
+++ packages/gamera/trunk/debian/patches/series	2012-04-18 12:39:06 UTC (rev 21260)
@@ -9,3 +9,4 @@
 graphmodule-fix-type-mismatch.diff
 nosetests.diff
 gcc-4.7-compat.diff
+trap-errors-from-pclose.diff

Added: packages/gamera/trunk/debian/patches/trap-errors-from-pclose.diff
===================================================================
--- packages/gamera/trunk/debian/patches/trap-errors-from-pclose.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/trap-errors-from-pclose.diff	2012-04-18 12:39:06 UTC (rev 21260)
@@ -0,0 +1,16 @@
+Description: trap errors from pclose(3)
+Author: Jakub Wilk <jwilk at debian.org>
+Last-Update: 2012-04-18
+
+--- a/tests/test_graph.py
++++ b/tests/test_graph.py
+@@ -935,7 +935,8 @@
+       cmd = "ps u -p %i | awk '{sum=sum+$6}; END {print sum}'" % os.getpid()
+       p = os.popen(cmd, "r")
+       memory = p.readline().strip()
+-      p.close()
++      if p.close() is not None:
++            raise OSError
+       return memory
+ 
+