]> code.ossystems Code Review - openembedded-core.git/commitdiff
scripts/combo-layer: fix still overzealous regex in default hook script
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Mon, 19 Sep 2011 14:07:30 +0000 (15:07 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 21 Sep 2011 12:27:35 +0000 (13:27 +0100)
In the previous fix to this hook script (OE core revision
e7aae45414e4597e9244f86a81fbc940f73785c8) a start-of-line (^) marker was
missed, so if a commit had no Signed-off-by line but it contained an
inner patch that did, the inner patch was modified causing a "corrupt
patch" error.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
scripts/combo-layer-hook-default.sh

index e535d5f4cc36386fd11b1cb18245341ffa6e2d74..8b148aca07c427e7d71c9094037a66dced3e7f07 100755 (executable)
@@ -10,4 +10,4 @@ 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 "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile