Whamcloud - gitweb
LU-422 broken lines need continuations
authorBrian J. Murrell <brian@whamcloud.com>
Thu, 16 Jun 2011 12:32:47 +0000 (08:32 -0400)
committerJohann Lombardi <johann@whamcloud.com>
Mon, 20 Jun 2011 09:15:58 +0000 (02:15 -0700)
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 <brian@whamcloud.com>
Change-Id: I7dab960da5ca5fbe7b1852873f72487fd753e415
Reviewed-on: http://review.whamcloud.com/949
Tested-by: Hudson
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
build/extract_patches

index 3764b42..0bf62b2 100755 (executable)
@@ -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}" \