8000 Added 'set -e' to composite cmdline constructs in debian/rules to pre… · healthonrails/scikit-learn@79749fd · GitHub
[go: up one dir, main page]

Skip to content

Commit 7974 8000 9fd

Browse files
committed
Added 'set -e' to composite cmdline constructs in debian/rules to prevent swallowing errors. Thanks to Jakub Wilk for citing me the relevant exerpt from Debian policy ;-)
1 parent d38004d commit 79749fd

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

debian/changelog

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scikit-learn (0.10.0~pre1-1) unstable; urgency=low
1+
scikit-learn (0.10.0-1) unstable; urgency=low
22

33
* Snapshot of upstream release branch
44
- Python 2.5 compatibility dropped
@@ -8,8 +8,11 @@ scikit-learn (0.10.0~pre1-1) unstable; urgency=low
88
* Adjusted dfsg and other rules to operate on sklearn directory
99
* Dropping cherry-picked fix up_release_sv_coef_memory
1010
* Operate on 'requested' not all supported Python versions
11+
* Added 'set -e' to composite cmdline constructs in debian/rules to
12+
prevent swallowing errors. Thanks to Jakub Wilk for citing me the relevant
13+
exerpt from Debian policy ;-)
1114

12-
-- Yaroslav Halchenko <debian@onerussian.com> Tue, 10 Jan 2012 17:52:27 -0500
15+
-- Yaroslav Halchenko <debian@onerussian.com> Thu, 12 Jan 2012 22:42:03 -0500
1316

1417
scikit-learn (0.9.0.dfsg-1) unstable; urgency=low
1518

debian/rules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ override_dh_installchangelogs:
5757
## move binary libraries into -lib
5858
override_dh_pysupport:
5959
: # Move platform-specific libraries into -lib
60+
set -e; \
6061
for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \
6162
sdir=$$(dirname $$lib) ; \
6263
tdir=$(PACKAGE_ROOT_DIR)-lib/$${sdir#*$(PACKAGE_NAME)/} ; \
@@ -68,6 +69,7 @@ override_dh_pysupport:
6869
: # Prune scikits/__init__.py to avoid conflicts
6970
find debian -wholename \*scikits/__init__.py -delete
7071
: # Move scikits. space into a compatibility package
72+
set -e; \
7173
find debian -wholename \*scikits -type d | while read skd; do \
7274
skbd=$$(dirname $$skd); \
7375
skbd_=$$(echo $$skbd | sed -e 's/sklearn/scikits-learn/g'); \

0 commit comments

Comments
 (0)
0