[Python-modules-commits] [cheetah] 04/05: Fix FTBFS due to change in CDBS 0.4.144 (cdbs_python_binary). Closes: #837009.

Arnaud Fontaine arnau at moszumanska.debian.org
Fri Nov 18 06:26:54 UTC 2016


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

arnau pushed a commit to branch master
in repository cheetah.

commit 61d2b111ff82a00def81297b7c1f3cf537fbc6bd
Author: Arnaud Fontaine <arnau at debian.org>
Date:   Fri Nov 18 12:48:20 2016 +0900

    Fix FTBFS due to change in CDBS 0.4.144 (cdbs_python_binary). Closes: #837009.
---
 debian/changelog | 7 +++++--
 debian/rules     | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50d4bce..e7df4c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 cheetah (2.4.4-4) UNRELEASED; urgency=low
 
   [ Arnaud Fontaine ]
-  * debian/rules: add --install-layout=deb to python install command to
-    install files in the proper directory, as per dh_python2 warning.
+  * d/rules:
+    + Add --install-layout=deb to python install command to
+      install files in the proper directory, as per dh_python2 warning.
+    + Fix FTBFS due to change in CDBS 0.4.144 (cdbs_python_binary).
+      Closes: #837009.
   * d/control:
     + Add dh-python to Build-Depends (dh_python2 warning).
     + Bump debhelper compat level to 10 (5 is deprecated).
diff --git a/debian/rules b/debian/rules
index d020c11..ee36c66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,11 +26,11 @@ binary-post-install/python-cheetah::
 	# fail if the tests fail, just display an error message
 	#
 	# Any better way to run the tests as this is very ugly?
-	for buildver in $(cdbs_python_build_versions); do \
+	for buildver in $(cdbs_python_flavors:python%=%); do \
 		echo "Running tests with python$$buildver..." && \
 		cd $(DEB_SRCDIR) && \
 		PATH=$(DEB_PYTHON_BUILDDIR)/scripts-$${buildver}:$$PATH \
 		PYTHONPATH=$$(echo $(DEB_PYTHON_BUILDDIR)/lib.linux-*-$$buildver) \
-		$(call cdbs_python_binary,python$$buildver) $(DEB_SRCDIR)/cheetah/Tests/Test.py || \
+		python$$buildver $(DEB_SRCDIR)/cheetah/Tests/Test.py || \
 		echo "FAILED with python$$buildver"; \
 	done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cheetah.git



More information about the Python-modules-commits mailing list