[oe-commits] Paul Eggleton : scripts/combo-layer: fix overzealous regex in default hook script

[git version control]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Aug 23 19:56:28 2011 +0100

scripts/combo-layer: fix overzealous regex in default hook script

combo-layer's hook scripts are intended to modify patches as they pass
through; the default one adds a prefix with the component name and
a line with the component repo revision before the Signed-off-by;
however the script was also unintentionally modifying the contents of
patches *within* the patches passing through it, which resulted in
unexpected failures when the combo-layer script attempted to use
"git am" to apply them.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 scripts/combo-layer-hook-default.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index f03c4fa..e535d5f 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 "0,/Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
+sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
+sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile