[Python-modules-commits] r23244 - in packages/numpy/trunk/debian (changelog rules)

Fri Jan 4 22:31:38 UTC 2013

Date: Friday, January 4, 2013 @ 22:31:36
  Author: morph
Revision: 23244

* debian/rules
  - safe-guard all for loops with 'set -e; ' to prevent uncaught failures;
    Closes: #695955

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/rules

Modified: packages/numpy/trunk/debian/changelog
===================================================================

--- packages/numpy/trunk/debian/changelog	2013-01-04 11:57:03 UTC (rev 23243)
+++ packages/numpy/trunk/debian/changelog	2013-01-04 22:31:36 UTC (rev 23244)
@@ -1,3 +1,12 @@
+python-numpy (1:1.7.0~rc1-2) UNRELEASED; urgency=low
+
+  [ Yaroslav Halchenko ]
+  * debian/rules
+    - safe-guard all for loops with 'set -e; ' to prevent uncaught failures;
+      Closes: #695955
+
+ -- Sandro Tosi <morph at debian.org>  Thu, 03 Jan 2013 23:22:45 +0100
+
 python-numpy (1:1.7.0~rc1-1) experimental; urgency=low
 
   * New upstream release candidate

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2013-01-04 11:57:03 UTC (rev 23243)
+++ packages/numpy/trunk/debian/rules	2013-01-04 22:31:36 UTC (rev 23244)
@@ -16,7 +16,7 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	for v in $(PY3VERS); do \
+	set -e; for v in $(PY3VERS); do \
 		python$$v setup.py build; \
 		python$$v-dbg setup.py build; \
 	done
@@ -34,11 +34,11 @@
 	mv debian/python3-numpy/usr/share/man/man1/f2py.1 \
 	  debian/python3-numpy/usr/share/man/man1/f2py3.1
 	# link manpage for versioned and dbg incarnations of f2py
-	for v in $(PY2VERS); do \
+	set -e; for v in $(PY2VERS); do \
 		dh_link /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v.1.gz; \
 		dh_link -ppython-numpy-dbg /usr/share/man/man1/f2py.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \
 	done
-	for v in $(PY3VERS); do \
+	set -e; for v in $(PY3VERS); do \
 		dh_link -ppython3-numpy /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py$$v.1.gz; \
 		dh_link -ppython3-numpy-dbg /usr/share/man/man1/f2py3.1.gz /usr/share/man/man1/f2py$$v-dbg.1.gz; \
 	done
@@ -47,7 +47,7 @@
 
 override_dh_install:
 	# add shebang information to f2py script
-	for v in $(PY2VERS) $(PY3VERS); do \
+	set -e; for v in $(PY2VERS) $(PY3VERS); do \
 		sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v," debian/tmp/usr/bin/f2py$$v; \
 		cp -a debian/tmp/usr/bin/f2py$$v debian/tmp/usr/bin/f2py$$v-dbg ; \
 		sed -i "1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python$$v-dbg," debian/tmp/usr/bin/f2py$$v-dbg; \
@@ -74,23 +74,23 @@
 	find $(CURDIR)/debian/python-numpy/ -name "*_d.so" -delete
 
 	# create symlinks for .h files
-	for i in $(PY2VERS); do \
+	set -e; for i in $(PY2VERS); do \
 	[ -d $(CURDIR)/debian/python-numpy/usr/include/python$$i ] || \
 		mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$$i; \
 		dh_link usr/lib/pymodules/python$$i/numpy/core/include/numpy usr/include/python$$i/numpy; \
 	done
-	for i in $(PY2VERS); do \
+	set -e; for i in $(PY2VERS); do \
 	[ -d $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d ] || \
 		mkdir -p $(CURDIR)/debian/python-numpy/usr/include/python$${i}_d; \
 		dh_link usr/lib/pymodules/python$$i/numpy/core/include/numpy usr/include/python$${i}_d/numpy; \
 	done
 	# Python 3
-	for i in $(PY3VERS); do \
+	set -e; for i in $(PY3VERS); do \
 	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$$i ] || \
 		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$$i; \
 		dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy usr/include/python$$i/numpy; \
 	done
-	for i in $(PY3VERS); do \
+	set -e; for i in $(PY3VERS); do \
 	[ -d $(CURDIR)/debian/python3-numpy/usr/include/python$${i}_d ] || \
 		mkdir -p $(CURDIR)/debian/python3-numpy/usr/include/python$${i}_d; \
 		dh_link -ppython3-numpy usr/lib/python3/dist-packages/numpy/core/include/numpy/ usr/include/python$${i}_d/numpy; \
@@ -116,7 +116,7 @@
 	dh_strip -ppython3-numpy --dbg-package=python3-numpy-dbg
 	# dh_strip seemingly doesn't catch the PEP 3149-style debug names
 	rm debian/python3-numpy/usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so
-	
+
 	# fix python-debug-in-wrong-location lintian warning
 	cd debian/python-numpy-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
 endif
@@ -129,7 +129,7 @@
 	mv debian/tmp2/f2py2.? debian/tmp2/f2py debian/python-numpy/usr/bin/
 	mkdir -p debian/python-numpy-dbg/usr/bin/
 	mv debian/tmp2/f2py2.?-dbg debian/tmp2/f2py-dbg debian/python-numpy-dbg/usr/bin/
-	
+
 	mkdir -p debian/python3-numpy/usr/bin/
 	mv debian/tmp2/f2py3.? debian/tmp2/f2py3 debian/python3-numpy/usr/bin/
 	mkdir -p debian/python3-numpy-dbg/usr/bin/
@@ -138,7 +138,7 @@
 	# GIGANTIC HACK - add back libnpymath.a
 	# get the file names, generate the new location, create the dir if missing, copy
 	# the file and then add it to the public list
-	for file in ./debian/tmp/usr/lib/python2.*/*-packages/numpy/core/lib/libnpymath.a ; do \
+	set -e; for file in ./debian/tmp/usr/lib/python2.*/*-packages/numpy/core/lib/libnpymath.a ; do \
 		newfile=$$(echo $$file | sed 's|tmp|python-numpy|' | sed "s|lib/python|lib/pyshared/python|" | sed 's|[^/]*-packages/||') ;\
 		mkdir -p $$(dirname $$newfile) ;\
 		cp -a $$file $$newfile ;\
@@ -166,26 +166,26 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	
+
 	# Install for Python 3
-	for v in $(PY3VERS); do \
+	set -e; for v in $(PY3VERS); do \
 		python$$v setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 		python$$v-dbg setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done
-	
+
 	# yes, we need to run tests after install
 	# The reason is that numpy tries hard to not let you run it from the
 	# source directory, so we need to mess with the import order so to
 	# select the code in the installation path
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	-for v in $(PY2VERS) ; do \
+	-set -e; for v in $(PY2VERS) ; do \
 		echo "-- running tests for "$$v" plain --" ; \
 		python$$v -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \
 		echo "-- running tests for "$$v" debug --" ; \
 		python$$v-dbg -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python$$v/dist-packages/') ; import numpy; numpy.test()" ; \
 	done
 	# Python 3.2 maps to python3/ dir alone? bah
-	-for v in $(PY3VERS) ; do \
+	-set -e; for v in $(PY3VERS) ; do \
 		echo "-- running tests for "$$v" plain --" ; \
 		python$$v -c "import sys ; sys.path.insert(0, '$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/') ; import numpy; numpy.test()" ; \
 		echo "-- running tests for "$$v" debug --" ; \


