packages (MYSQL_5_0): mysql/percona.sh - merge from HEAD

[glen]

Author: glen                         Date: Sat Mar 12 14:40:05 2011 GMT
Module: packages                      Tag: MYSQL_5_0
---- Log message:
- merge from HEAD

---- Files affected:
packages/mysql:
   percona.sh (1.7.2.2 -> 1.7.2.3) 

---- Diffs:

================================================================
Index: packages/mysql/percona.sh
diff -u packages/mysql/percona.sh:1.7.2.2 packages/mysql/percona.sh:1.7.2.3
--- packages/mysql/percona.sh:1.7.2.2	Thu Feb 24 14:47:47 2011
+++ packages/mysql/percona.sh	Sat Mar 12 15:40:00 2011
@@ -19,6 +19,8 @@
 	filterdiff -x '*/configure'
 }
 
+set -e
+
 if [ -d $version ]; then
 	cd $version
 	bzr pull
@@ -31,7 +33,12 @@
 > .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 @@
 		${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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/percona.sh?r1=1.7.2.2&r2=1.7.2.3&f=u