[oe-commits] Patrick Ohly : combo-layer-hook-default.sh: avoid duplicating prefix

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 03be3d350425783a5938a7e4c0b858cda634b71d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=03be3d350425783a5938a7e4c0b858cda634b71d

Author: Patrick Ohly <patrick.ohly at intel.com>
Date:   Fri Mar 13 12:51:54 2015 +0100

combo-layer-hook-default.sh: avoid duplicating prefix

The existing patch might already have the desired prefix, perhaps
even multiple times (due to some previous import error). Ensure
that after the replace, the prefix is present exactly once.

Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/combo-layer-hook-default.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index 8b148ac..9dd5aed 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/scripts/combo-layer-hook-default.sh
@@ -9,5 +9,5 @@ patchfile=$1
 rev=$2
 reponame=$3
 
-sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
+sed -i -e "s#^Subject: \[PATCH\] \($reponame: \)*\(.*\)#Subject: \[PATCH\] $reponame: \2#" $patchfile
 sed -i -e "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile