[python-pdal] 06/07: Add patch to not throw exception for PDAL Python version mismatch.

Bas Couwenberg sebastic at debian.org
Mon Aug 29 19:30:35 UTC 2016


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

sebastic pushed a commit to branch master
in repository python-pdal.

commit 615b934db9d8811375a5b9c2b4978f8ca9ffe4b6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 29 21:15:57 2016 +0200

    Add patch to not throw exception for PDAL Python version mismatch.
---
 debian/changelog                         |  1 +
 debian/patches/pdal-python-version.patch | 14 ++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cbb58d2..2b8292a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-pdal (1.3.0+ds-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Require at least PDAL 1.3.0.
   * Bump Standards-Version to 3.9.8, no changes.
+  * Add patch to not throw exception for PDAL Python version mismatch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 29 Aug 2016 19:54:03 +0200
 
diff --git a/debian/patches/pdal-python-version.patch b/debian/patches/pdal-python-version.patch
new file mode 100644
index 0000000..e697cad
--- /dev/null
+++ b/debian/patches/pdal-python-version.patch
@@ -0,0 +1,14 @@
+Description: Don't throw exception for PDAL Python version mismatch.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/setup.py
++++ b/setup.py
+@@ -122,7 +122,7 @@ if pdal_config and "clean" not in sys.ar
+                 running_major = int(sys.version_info[0])
+                 if built_major != running_major:
+                     message = "Version mismatch. PDAL Python support was compiled against version %d.x but setup is running version is %d.x. "
+-                    raise Exception(message % (built_major, running_major))
++                    print(message % (built_major, running_major))
+ 
+     # older versions of pdal-config do not include --python-version switch
+     except ValueError:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..66989c0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+pdal-python-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-pdal.git



More information about the Pkg-grass-devel mailing list