- merge from HEAD

Changed files:
    percona.sh -> 1.7.2.3

diff --git a/percona.sh b/percona.sh
index 0be1e9e0055d7c2cb8b831c2cb7e0497b1d201fb..93bd1b4bb2ef1e65cb4c56558995c0e067775eb3 100644 (file)
--- a/percona.sh
+++ b/percona.sh
@@ -19,6 +19,8 @@ filter_files() {
        filterdiff -x '*/configure'
 }
 
+set -e
+
 if [ -d $version ]; then
        cd $version
        bzr pull
@@ -31,7 +33,12 @@ fi
 > .patch.spec
 i=100
 for patch in $(cat $version/series | filter_names); do
-       file=mysql-$patch
+       # if patch already existed, use mysql- prefix
+       if [ -f mysql-$patch ]; then
+               file=mysql-$patch
+       else
+               file=$patch
+       fi
        cat $version/$patch | filter_files > $file
 
        if [ -z "$(awk -vfile=$file -F/ '$2 == file{print}' CVS/Entries)" ]; then
@@ -39,8 +46,12 @@ for patch in $(cat $version/series | filter_names); do
                ${branch:+cvs up -r $branch $file}
        fi
 
-       echo >&2 "Adding: $patch"
-       printf "Patch%d:\t%s\n" $i %{name}-$patch >> .percona.spec
+       if [ "$patch" != "$file" ]; then
+               echo >&2 "Adding: $file ($patch)"
+       else
+               echo >&2 "Adding: $file"
+       fi
+       printf "Patch%d:\t%s\n" $i $(echo "$file" | sed -e 's,^mysql-,%{name}-,') >> .percona.spec
        printf "%%patch%d -p1\n" $i >> .patch.spec
        i=$((i+1))
 done