From: Thomas Goirand Date: Wed, 3 Jun 2015 09:40:17 +0000 (+0200) Subject: Replaced && by ; in debian/rules. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=83d5b12622f7c53d9ebb548332dbf3a277d11533;p=openstack-build%2Fheat-build.git Replaced && by ; in debian/rules. Rewritten-From: 423d6ef17d273914dfaf3fc659434bdaed2a471d --- diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 849ab29a..5bc33606 100644 --- 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 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 492c9c2a..3d180564 100755 --- 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