From: Sam Hague Date: Wed, 22 Jan 2014 23:49:43 +0000 (-0500) Subject: Fix patch error because of whitespace in run.sh. X-Git-Tag: release/lithium-sr2~195^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5a42395b6853c26167e62fa52d825f2372282581;p=integration%2Fdistribution.git Fix patch error because of whitespace in run.sh. Patch fails one hunk because of a mismatch in whitespace. Also fixed a warning about changelog date being bogus. Change-Id: Ie387a77bdc1702e19af0e99cec4157140adeb5b2 Signed-off-by: Sam Hague --- diff --git a/distributions/base/src/assemble/resources/run.sh b/distributions/base/src/assemble/resources/run.sh index e60310ac..3936a2a9 100755 --- a/distributions/base/src/assemble/resources/run.sh +++ b/distributions/base/src/assemble/resources/run.sh @@ -20,9 +20,9 @@ while true ; do (( i += 1 )) case "${@:$i:1}" in -of13) OF13=1 ;; - -bundlefilter) (( i += 1 )); BUNDLEFILTER="|${@:$i:1}";; + -bundlefilter) (( i += 1 )); BUNDLEFILTER="|${@:$i:1}";; -help) usage ;; - "") break ;; + "") break ;; esac done @@ -42,4 +42,4 @@ FILTERENDING=').*' FILTER=${FILTERBEGINING}${OF_FILTER}${BUNDLEFILTER}${FILTERENDING} # Run the command -$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$FILTER" $NEWARGS +$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$FILTER" $NEWARGS