From: Alexandru Avadanii Date: Mon, 4 Sep 2017 20:52:10 +0000 (+0200) Subject: patches/scripts: Fix whitespace in context X-Git-Tag: opnfv-5.0.RC1~94 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F41019%2F1;p=fuel.git patches/scripts: Fix whitespace in context git option '--ignore-whitespace' has issues, at least on certain versions of git, like 2.7.4. Work around it by adding the trailing whitespace we previously removed in patch context lines. Change-Id: Id192a87ec92c798fa808bb8ef38384160ee3faf5 Signed-off-by: Alexandru Avadanii --- diff --git a/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch b/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch index 7e995e767..20e17c6ca 100644 --- a/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch +++ b/mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch @@ -18,7 +18,7 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt-master-setup.sh b/salt-master-setup.sh -index 32a1fea..7454b26 100755 +index cba21fb..0dd3036 100755 --- a/salt-master-setup.sh +++ b/salt-master-setup.sh @@ -237,12 +237,12 @@ install_salt_master_pkg() @@ -35,8 +35,8 @@ index 32a1fea..7454b26 100755 + curl -L https://bootstrap.saltstack.com | sed 's@"amd64")@"amd64"|"arm64")@g' | $SUDO sh -s -- -M ${BOOTSTRAP_SALTSTACK_OPTS} &>/dev/null || true ;; esac - -@@ -308,10 +308,10 @@ install_salt_minion_pkg() + +@@ -310,10 +310,10 @@ install_salt_minion_pkg() case $PLATFORM_FAMILY in debian)