Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Added 'set -e' to composite cmdline constructs in debian/rules to pre…

…vent swallowing errors. Thanks to Jakub Wilk for citing me the relevant exerpt from Debian policy ;-)
  • Loading branch information...
commit 79749fd2939781e201191ef081143d8a575984e7 1 parent d38004d
Yaroslav Halchenko yarikoptic authored

Showing 2 changed files with 7 additions and 2 deletions. Show diff stats Hide diff stats

  1. +5 2 debian/changelog
  2. +2 0  debian/rules
7 debian/changelog
... ... @@ -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
2 2
3 3 * Snapshot of upstream release branch
4 4 - Python 2.5 compatibility dropped
@@ -8,8 +8,11 @@ scikit-learn (0.10.0~pre1-1) unstable; urgency=low
8 8 * Adjusted dfsg and other rules to operate on sklearn directory
9 9 * Dropping cherry-picked fix up_release_sv_coef_memory
10 10 * 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 ;-)
11 14
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
13 16
14 17 scikit-learn (0.9.0.dfsg-1) unstable; urgency=low
15 18
2  debian/rules
@@ -57,6 +57,7 @@ override_dh_installchangelogs:
57 57 ## move binary libraries into -lib
58 58 override_dh_pysupport:
59 59 : # Move platform-specific libraries into -lib
  60 + set -e; \
60 61 for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \
61 62 sdir=$$(dirname $$lib) ; \
62 63 tdir=$(PACKAGE_ROOT_DIR)-lib/$${sdir#*$(PACKAGE_NAME)/} ; \
@@ -68,6 +69,7 @@ override_dh_pysupport:
68 69 : # Prune scikits/__init__.py to avoid conflicts
69 70 find debian -wholename \*scikits/__init__.py -delete
70 71 : # Move scikits. space into a compatibility package
  72 + set -e; \
71 73 find debian -wholename \*scikits -type d | while read skd; do \
72 74 skbd=$$(dirname $$skd); \
73 75 skbd_=$$(echo $$skbd | sed -e 's/sklearn/scikits-learn/g'); \

0 comments on commit 79749fd

Please sign in to comment.
Something went wrong with that request. Please try again.