Merge lp://staging/~tribaal/storm/storm-packaging-fix-python-central into lp://staging/~landscape/storm/storm-packaging-lds
Proposed by
Chris Glass
Status: | Merged |
---|---|
Merged at revision: | 14 |
Proposed branch: | lp://staging/~tribaal/storm/storm-packaging-fix-python-central |
Merge into: | lp://staging/~landscape/storm/storm-packaging-lds |
Diff against target: |
554 lines (+378/-96) 13 files modified
changelog (+6/-0) compat (+1/-1) control (+72/-32) copyright (+256/-33) docs (+2/-0) install (+4/-0) patches/allow-zope-component.patch (+14/-0) patches/no-tests-in-deb.patch (+0/-13) patches/series (+1/-0) pycompat (+0/-1) python-storm-dbg.install (+1/-0) rules (+20/-16) source/format (+1/-0) |
To merge this branch: | bzr merge lp://staging/~tribaal/storm/storm-packaging-fix-python-central |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andreas Hasenack | Approve | ||
Landscape | Pending | ||
Review via email: mp+203737@code.staging.launchpad.net |
Description of the change
Fixes the packaging for trusty.
To post a comment you must log in.
Try with this patch to disable the test suite if it's building in a ppa. I grabbed this trick from juju-deployer, which disables tests that require networking if DEB_BUILD_ARCH or TESTING_ENVIRONMENT are set.
=== modified file 'rules'
--- rules revid:<email address hidden>
+++ rules 2014-01-30 19:18:09 +0000
@@ -10,11 +10,15 @@
rm -rf storm.egg-info
override_ dh_auto_ test: $(DEB_BUILD_ OPTIONS) )) BUILD_ARCH) )
+# don't run tests if the user set nocheck
ifeq (,$(filter nocheck,
- for python in $(shell pyversions -r); do \
- $$python setup.py test; \
- $$python-dbg setup.py test; \
- done
+# don't run tests if in a ppa builder
+ ifeq (,$(DEB_
+ for python in $(shell pyversions -r); do \
+ $$python setup.py test; \
+ $$python-dbg setup.py test; \
+ done
+ endif
endif
override_dh_strip:
Watch tab/spaces above: the "ifeq" and "endif" statements use spaces, the rest uses tabs (makefile syntax).