Patchwork [1/1] scripts/combo-layer: fix still overzealous regex in default hook script

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 19, 2011, 2:20 p.m.
Message ID <b1f7bdfc28f0197596b2e362e01c75e1152fa971.1316441889.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/11709/
State New, archived
Headers show

Comments

Paul Eggleton - Sept. 19, 2011, 2:20 p.m.
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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Otavio Salvador - Sept. 19, 2011, 4:49 p.m.
On Mon, Sep 19, 2011 at 11:20, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> 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>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Tested and this works as expected :-) Thanks by fixing it.

Patch

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