Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[maas] artifact sync: improve barrier condition
[fuel.git]
/
mcp
/
patches
/
patch.sh
diff --git
a/mcp/patches/patch.sh
b/mcp/patches/patch.sh
index
6c6d646
..
1da3bc5
100755
(executable)
--- a/
mcp/patches/patch.sh
+++ b/
mcp/patches/patch.sh
@@
-1,4
+1,4
@@
-#!/bin/bash -e
x
+#!/bin/bash -e
##############################################################################
# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
# All rights reserved. This program and the accompanying materials
##############################################################################
# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
# All rights reserved. This program and the accompanying materials
@@
-7,10
+7,14
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+
if [ -r "$1" ]; then
while IFS=': ' read -r p_dest p_file; do
if [ -r "$1" ]; then
while IFS=': ' read -r p_dest p_file; do
- if [[ "${p_dest}" =~ $2 ]]; then
- patch -fd "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"
+ if [[ ! "${p_dest}" =~ '^#' ]] && [[ "${p_dest}" =~ $2 ]] && \
+ ! patch --dry-run -Rd "${p_dest}" -r - -s -p1 < \
+ "/root/fuel/mcp/patches/${p_file}" > /dev/null; then
+ patch -d "${p_dest}" -p1 < "/root/fuel/mcp/patches/${p_file}"
fi
done < "$1"
fi
fi
done < "$1"
fi