From 5b04698aea784fff3af42cd75f465b237b5cce14 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 16 Jun 2011 08:32:47 -0400 Subject: [PATCH] LU-422 broken lines need continuations In commit fb7a499bf47530b9eee162990c8f1815b643d30e there was a sed introduced that was broken across several lines with no line continuations: ver=$(echo $ver | sed -e 's/^v(.*)/\1/' -e 's/_RC[0-9].*$//' -e 's/_/./g') This is, of course, incorrect. Signed-off-by: Brian J. Murrell Change-Id: I7dab960da5ca5fbe7b1852873f72487fd753e415 Reviewed-on: http://review.whamcloud.com/949 Tested-by: Hudson Reviewed-by: Yang Sheng Reviewed-by: Andreas Dilger Reviewed-by: Johann Lombardi --- build/extract_patches | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/extract_patches b/build/extract_patches index 3764b42..0bf62b2 100755 --- a/build/extract_patches +++ b/build/extract_patches @@ -1,4 +1,5 @@ #!/bin/bash +set -x # extract all of the changesets since the last tagged version and put them # into debian/patche{s,d} as if this was a patched tree on that tag @@ -16,8 +17,8 @@ if [ $ffw -gt 0 ]; then tag=$ver if [[ $ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$ ]]; then ver=$(echo $ver | - sed -e 's/^v\(.*\)/\1/' - -e 's/_RC[0-9].*$//' + sed -e 's/^v\(.*\)/\1/' \ + -e 's/_RC[0-9].*$//' \ -e 's/_/./g') fi pdir="$TARGET/debian/patches" @@ -47,7 +48,7 @@ w q EOF desc=$(cat $file | sed -e '1,/^$/d' \ - -e '/^---$/,$d') + -e '/^---$/,$d') dpatch_file=${file/.patch/.dpatch} sed -e '1,/^---$/d' $file | \ dpatch patch-template -p "${file%.patch}" \ -- 1.8.3.1