Skip to content

Commit

Permalink
Added 'set -e' to composite cmdline constructs in debian/rules to pre…
Browse files Browse the repository at this point in the history
…vent swallowing errors. Thanks to Jakub Wilk for citing me the relevant exerpt from Debian policy ;-)
  • Loading branch information
yarikoptic committed Jan 13, 2012
1 parent d38004d commit 79749fd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 5 additions & 2 deletions debian/changelog
@@ -1,4 +1,4 @@
scikit-learn (0.10.0~pre1-1) unstable; urgency=low
scikit-learn (0.10.0-1) unstable; urgency=low

* Snapshot of upstream release branch
- Python 2.5 compatibility dropped
Expand All @@ -8,8 +8,11 @@ scikit-learn (0.10.0~pre1-1) unstable; urgency=low
* Adjusted dfsg and other rules to operate on sklearn directory
* Dropping cherry-picked fix up_release_sv_coef_memory
* Operate on 'requested' not all supported Python versions
* 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 ;-)

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

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

Expand Down
2 changes: 2 additions & 0 deletions debian/rules
Expand Up @@ -57,6 +57,7 @@ override_dh_installchangelogs:
## move binary libraries into -lib
override_dh_pysupport:
: # Move platform-specific libraries into -lib
set -e; \
for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \
sdir=$$(dirname $$lib) ; \
tdir=$(PACKAGE_ROOT_DIR)-lib/$${sdir#*$(PACKAGE_NAME)/} ; \
Expand All @@ -68,6 +69,7 @@ override_dh_pysupport:
: # Prune scikits/__init__.py to avoid conflicts
find debian -wholename \*scikits/__init__.py -delete
: # Move scikits. space into a compatibility package
set -e; \
find debian -wholename \*scikits -type d | while read skd; do \
skbd=$$(dirname $$skd); \
skbd_=$$(echo $$skbd | sed -e 's/sklearn/scikits-learn/g'); \
Expand Down

0 comments on commit 79749fd

Please sign in to comment.