[oe-commits] Paul Eggleton : scripts/combo-layer: fix still overzealous regex in default hook script
git version control
git at git.openembedded.org
Wed Sep 21 12:43:23 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Mon Sep 19 15:07:30 2011 +0100
scripts/combo-layer: fix still overzealous regex in default hook script
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 at linux.intel.com>
---
scripts/combo-layer-hook-default.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index e535d5f..8b148ac 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/scripts/combo-layer-hook-default.sh
@@ -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
More information about the Openembedded-commits
mailing list