Replaced && by ; in debian/rules.

Rewritten-From: 423d6ef17d273914dfaf3fc659434bdaed2a471d

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 849ab29a02a2d65bf31ef1d0071e2ea6752b5af7..5bc33606815d8b5c6074bd9639dd0a297327f610 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+heat (2015.1.0-3) UNRELEASED; urgency=medium
+
+  * Replaced && by ; in debian/rules.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 03 Jun 2015 11:40:02 +0200
+
 heat (2015.1.0-2) unstable; urgency=medium
 
   * Added missing oslo.log namespace when generating default config.

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 492c9c2aa86a688cef4d9369f81f6c185dded57c..3d1805645d913b64a052b78cb66c4fa8c753302f 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -13,8 +13,8 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
        rm -rf .testrepository
        testr init
-       set -e && set -x && \
-               TEMP_REZ=`mktemp -t` && \
+       set -e ; set -x ; \
+               TEMP_REZ=`mktemp -t` ; \
                PYTHONPATH=$(CURDIR) testr run --subunit 'heat.tests.*' | tee $$TEMP_REZ | subunit2pyunit || true ; \
                cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
                rm -f $$TEMP_REZ ;
@@ -58,7 +58,7 @@ override_dh_install:
 
 
        dh_install --fail-missing -Xbin/cinder-keystone-setup
-       set -e && for pyvers in $(PYTHONS); do \
+       set -e ; for pyvers in $(PYTHONS); do \
                mkdir -p $(CURDIR)/debian/python-heat/usr/lib/python$$pyvers/dist-packages/heat/plugins ; \
                cp -rf contrib/heat_keystoneclient_v2/heat_keystoneclient_v2 $(CURDIR)/debian/python-heat/usr/lib/python$$pyvers/dist-packages/heat/plugins ; \
         done