diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-04 22:52:10 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-04 22:54:20 +0200 |
| commit | 06c66940cad08ae875bba5791822e8895468780b (patch) | |
| tree | f7f03ad173eba23a6304874393ba761d7d3953d6 /mcp/patches/scripts | |
| parent | 978fd9da91b6cdd522e79a4b8c31cf8f800222a3 (diff) | |
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/scripts')
| -rw-r--r-- | mcp/patches/scripts/0001-salt-master-setup.sh-Allow-arm64-salt-bootstrap.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 <Alexandru.Avadanii@enea.com> 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) |