[bcolz] 01/03: add catch-cpuinfo-import-exception.patch

Daniel Stender stender at moszumanska.debian.org
Mon Dec 19 11:04:35 UTC 2016


This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch master
in repository bcolz.

commit 92cab0d6fcd4f15fe213ad5d51bfb205e176a549
Author: Daniel Stender <stender at debian.org>
Date:   Mon Dec 19 11:49:25 2016 +0100

    add catch-cpuinfo-import-exception.patch
---
 debian/changelog                                    |  3 ++-
 debian/patches/catch-cpuinfo-import-exception.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b4b4c78..bc16cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ bcolz (1.1.0+ds1-2) UNRELEASED; urgency=medium
   * deb/rules:
     + preset SETUPTOOLS_SCM_PRETEND_VERSION.
   * add bcolz/version.py to deb/clean.
+  * add catch-cpuinfo-import-exception.patch.
 
- -- Daniel Stender <stender at debian.org>  Sun, 18 Dec 2016 19:20:47 +0100
+ -- Daniel Stender <stender at debian.org>  Mon, 19 Dec 2016 11:48:47 +0100
 
 bcolz (1.1.0+ds1-1) experimental; urgency=medium
 
diff --git a/debian/patches/catch-cpuinfo-import-exception.patch b/debian/patches/catch-cpuinfo-import-exception.patch
new file mode 100644
index 0000000..0f72e30
--- /dev/null
+++ b/debian/patches/catch-cpuinfo-import-exception.patch
@@ -0,0 +1,21 @@
+Description: cpuinfo raises an Exception on non supported archs (arm64, mips, s390x etc.).
+ c-blosc isn't compiled here and therefore cpuinfo isn't even needed.
+Author: Daniel Stender <stender at debian.org>
+Forwarded: not-needed
+Last-Update: 2016-12-19
+
+--- a/setup.py
++++ b/setup.py
+@@ -25,8 +25,10 @@
+ from pkg_resources import resource_filename
+ 
+ # For guessing the capabilities of the CPU for C-Blosc
+-import cpuinfo
+-
++try:
++    import cpuinfo
++except Exception:
++    pass
+ 
+ class LazyCommandClass(dict):
+     """
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3f5feb2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+catch-cpuinfo-import-exception.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/bcolz.git



More information about the debian-science-commits mailing list