[SCM] Packaging for pytables branch, master, updated. debian/2.3.1-3
Yaroslav Halchenko
debian at onerussian.com
Mon Mar 5 23:08:33 UTC 2012
The following commit has been merged in the master branch:
commit 60c07a45e08745db652690f01afee61ea4bb7184
Author: Yaroslav Halchenko <debian at onerussian.com>
Date: Mon Mar 5 16:32:33 2012 -0500
minor: bad_arch -> _arch_without_blosc
diff --git a/debian/patches/disable_blosc.patch b/debian/patches/disable_blosc.patch
index 537427e..bb55980 100644
--- a/debian/patches/disable_blosc.patch
+++ b/debian/patches/disable_blosc.patch
@@ -14,7 +14,7 @@ Author: Julian Taylor <jtaylor at ubuntu.com>
libnames = ('hdf5', 'zlib', 'lzo', 'bzip2', 'blosc')
-+ def bad_arch():
++ def _arch_without_blosc():
+ import platform
+ arch = platform.machine().lower()
+ for a in ["arm", "sparc", "mips"]:
@@ -30,7 +30,7 @@ Author: Julian Taylor <jtaylor at ubuntu.com>
return (bzip2_version, bzip2_version_string, bzip2_version_date)
elif strcmp(name, "blosc") == 0:
- return (blosc_version, blosc_version_string, blosc_version_date)
-+ if not bad_arch():
++ if not _arch_without_blosc():
+ return (blosc_version, blosc_version_string, blosc_version_date)
else:
raise ValueError("""\
@@ -42,7 +42,7 @@ Author: Julian Taylor <jtaylor at ubuntu.com>
from tables.utils import detectNumberOfCores
-
-+def bad_arch():
++def _arch_without_blosc():
+ import platform
+ arch = platform.machine().lower()
+ for a in ["arm", "sparc", "mips"]:
@@ -59,7 +59,7 @@ Author: Julian Taylor <jtaylor at ubuntu.com>
- blosc_date = tinfo[2].split()[1]
- if tinfo is not None:
- print "Blosc version: %s (%s)" % (tinfo[1], blosc_date)
-+ if not bad_arch():
++ if not _arch_without_blosc():
+ blosc_date = tinfo[2].split()[1]
+ if tinfo is not None:
+ print "Blosc version: %s (%s)" % (tinfo[1], blosc_date)
--
Packaging for pytables
More information about the debian-science-commits
mailing list