[Python-modules-commits] r11060 - in packages/epsilon/trunk/debian/patches (4 files)

[bernat at users.alioth.debian.org]

    Date: Saturday, January 9, 2010 @ 14:29:15
  Author: bernat
Revision: 11060

Swap patch names for use-proc-mounts.diff and fix-test_cmp.diff.

Added:
  packages/epsilon/trunk/debian/patches/fix-test_cmp.diff
    (from rev 11058, packages/epsilon/trunk/debian/patches/use-proc-mounts.diff)
  packages/epsilon/trunk/debian/patches/use-proc-mounts.diff
    (from rev 11058, packages/epsilon/trunk/debian/patches/fix-test_cmp.diff)
Deleted:
  packages/epsilon/trunk/debian/patches/fix-test_cmp.diff
  packages/epsilon/trunk/debian/patches/use-proc-mounts.diff

Deleted: packages/epsilon/trunk/debian/patches/fix-test_cmp.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/fix-test_cmp.diff	2010-01-09 14:27:38 UTC (rev 11059)
+++ packages/epsilon/trunk/debian/patches/fix-test_cmp.diff	2010-01-09 14:29:15 UTC (rev 11060)
@@ -1,12 +0,0 @@
-# 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]))

Copied: packages/epsilon/trunk/debian/patches/fix-test_cmp.diff (from rev 11058, packages/epsilon/trunk/debian/patches/use-proc-mounts.diff)
===================================================================
--- packages/epsilon/trunk/debian/patches/fix-test_cmp.diff	                        (rev 0)
+++ packages/epsilon/trunk/debian/patches/fix-test_cmp.diff	2010-01-09 14:29:15 UTC (rev 11060)
@@ -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)

Deleted: packages/epsilon/trunk/debian/patches/use-proc-mounts.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/use-proc-mounts.diff	2010-01-09 14:27:38 UTC (rev 11059)
+++ packages/epsilon/trunk/debian/patches/use-proc-mounts.diff	2010-01-09 14:29:15 UTC (rev 11060)
@@ -1,11 +0,0 @@
-# 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)

Copied: packages/epsilon/trunk/debian/patches/use-proc-mounts.diff (from rev 11058, packages/epsilon/trunk/debian/patches/fix-test_cmp.diff)
===================================================================
--- packages/epsilon/trunk/debian/patches/use-proc-mounts.diff	                        (rev 0)
+++ packages/epsilon/trunk/debian/patches/use-proc-mounts.diff	2010-01-09 14:29:15 UTC (rev 11060)
@@ -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]))