[Python-modules-commits] r7658 - in packages/epsilon/trunk/debian (7 files)

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

    Date: Thursday, February 19, 2009 @ 22:23:14
  Author: mithrandi-guest
Revision: 7658

* Make epsilon.scripts.benchmark use /proc/mounts instead of /etc/mtab as
  this is more reliable.
* Fix an incorrect test failure that occurs when local time is UTC.

Added:
  packages/epsilon/trunk/debian/patches/
  packages/epsilon/trunk/debian/patches/fix-test_cmp.diff
  packages/epsilon/trunk/debian/patches/series
  packages/epsilon/trunk/debian/patches/use-proc-mounts.diff
Modified:
  packages/epsilon/trunk/debian/changelog
  packages/epsilon/trunk/debian/control
  packages/epsilon/trunk/debian/rules

Modified: packages/epsilon/trunk/debian/changelog
===================================================================
--- packages/epsilon/trunk/debian/changelog	2009-02-19 22:13:09 UTC (rev 7657)
+++ packages/epsilon/trunk/debian/changelog	2009-02-19 22:23:14 UTC (rev 7658)
@@ -17,6 +17,9 @@
   * Remove epsilon.release; this functionality depends on Combinator which
     shouldn't be packaged, and will probably be moved into Combinator upstream
     shortly.
+  * Make epsilon.scripts.benchmark use /proc/mounts instead of /etc/mtab as
+    this is more reliable.
+  * Fix an incorrect test failure that occurs when local time is UTC.
 
   [ Emilio Pozuelo Monfort ]
   * debian/rules: remove the build/ dir from the initial destination and not

Modified: packages/epsilon/trunk/debian/control
===================================================================
--- packages/epsilon/trunk/debian/control	2009-02-19 22:13:09 UTC (rev 7657)
+++ packages/epsilon/trunk/debian/control	2009-02-19 22:23:14 UTC (rev 7658)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>, Tristan Seligmann <mithrandi at mithrandi.net>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, python-support (>= 0.4)
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python, python-support (>= 0.4), quilt
 Build-Depends-Indep: python-twisted-core, python-openssl, python-nevow, python-zopeinterface
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/epsilon/trunk/

Added: packages/epsilon/trunk/debian/patches/fix-test_cmp.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/fix-test_cmp.diff	                        (rev 0)
+++ packages/epsilon/trunk/debian/patches/fix-test_cmp.diff	2009-02-19 22:23:14 UTC (rev 7658)
@@ -0,0 +1,12 @@
+# Use /proc/mounts instead of /etc/mtab, as this is more reliable.
+--- a/epsilon/scripts/benchmark.py
++++ b/epsilon/scripts/benchmark.py
+@@ -423,7 +423,7 @@
+     """
+     possibilities = []
+     cwd = os.getcwd()
+-    for L in file('/etc/mtab'):
++    for L in file('/proc/mounts'):
+         parts = L.split()
+         if cwd.startswith(parts[1]):
+             possibilities.append((len(parts[1]), parts[0]))

Added: packages/epsilon/trunk/debian/patches/series
===================================================================
--- packages/epsilon/trunk/debian/patches/series	                        (rev 0)
+++ packages/epsilon/trunk/debian/patches/series	2009-02-19 22:23:14 UTC (rev 7658)
@@ -0,0 +1,2 @@
+use-proc-mounts.diff
+fix-test_cmp.diff

Added: packages/epsilon/trunk/debian/patches/use-proc-mounts.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/use-proc-mounts.diff	                        (rev 0)
+++ packages/epsilon/trunk/debian/patches/use-proc-mounts.diff	2009-02-19 22:23:14 UTC (rev 7658)
@@ -0,0 +1,11 @@
+# Fix a test failure when local time is UTC.
+--- a/epsilon/test/test_extime.py
++++ b/epsilon/test/test_extime.py
+@@ -71,7 +71,6 @@
+     def test_cmp(self):
+         now = time.gmtime()
+         self.assertEquals(extime.Time.fromStructTime(now), extime.Time.fromStructTime(now))
+-        self.assertNotEquals(extime.Time.fromStructTime(now), extime.Time.fromStructTime(time.localtime()))
+         self.assertNotEquals(extime.Time.fromStructTime(now), 13)
+ 
+         aTime = extime.Time.fromStructTime(now)

Modified: packages/epsilon/trunk/debian/rules
===================================================================
--- packages/epsilon/trunk/debian/rules	2009-02-19 22:13:09 UTC (rev 7657)
+++ packages/epsilon/trunk/debian/rules	2009-02-19 22:23:14 UTC (rev 7658)
@@ -2,6 +2,7 @@
 DEB_PYTHON_SYSTEM = pysupport
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 PKGDIR=debian/python-epsilon
 
 DEB_INSTALL_MANPAGES_python-epsilon := debian/epsilon-benchmark.1