X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fpatches%2Fpatch.sh;h=1da3bc59760c0571ef7f25a95ceae345d5842ef6;hb=faa82bb7a3fc85b6e7dbd5adeae76d18043ff161;hp=b56ebb81524cf7dde5df155b3cea173d011e8575;hpb=139aacf390d38b60f4fe4fd618a0bcf6b54b35cf;p=fuel.git

diff --git a/mcp/patches/patch.sh b/mcp/patches/patch.sh
index b56ebb815..1da3bc597 100755
--- a/mcp/patches/patch.sh
+++ b/mcp/patches/patch.sh
@@ -1,9 +1,20 @@
-#!/bin/bash -ex
+#!/bin/bash -e
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# 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 [[ "${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