packages (MYSQL_5_1): mysql/percona.sh - from head

[arekm]

Author: arekm                        Date: Fri Sep 16 19:30:02 2011 GMT
Module: packages                      Tag: MYSQL_5_1
---- Log message:
- from head

---- Files affected:
packages/mysql:
   percona.sh (1.7.4.3 -> 1.7.4.3.2.1) 

---- Diffs:

================================================================
Index: packages/mysql/percona.sh
diff -u packages/mysql/percona.sh:1.7.4.3 packages/mysql/percona.sh:1.7.4.3.2.1
--- packages/mysql/percona.sh:1.7.4.3	Sat Mar 12 15:52:46 2011
+++ packages/mysql/percona.sh	Fri Sep 16 21:29:57 2011
@@ -1,12 +1,14 @@
 #!/bin/sh
 # updates percona patches
 # http://www.percona.com/docs/wiki/repositories:start
-# https://code.launchpad.net/percona-server
-# https://launchpad.net/percona-server/5.1
-# bzr branch lp:percona-server/5.1
+# http://bazaar.launchpad.net/~percona-dev/percona-server/5.5.8/files
+# https://launchpad.net/percona-server/5.5
+# bzr branch lp:percona-server/5.5
 
 version=5.1
 bzr_branch=lp:percona-server/$version
+#version=5.5.9
+#bzr_branch=lp:percona-dev/percona-server/$version
 branch=MYSQL_5_1
 
 filter_names() {
@@ -21,6 +23,8 @@
 	filterdiff -x '*/configure'
 }
 
+set -e
+
 if [ -d $version ]; then
 	cd $version
 	bzr pull
@@ -32,17 +36,27 @@
 > .percona.spec
 > .patch.spec
 i=100
-for patch in $(cat $version/series | filter_names); do
-	file=mysql-$patch
-	cat $version/$patch | filter_files > $file
+[ -d "$version/patches" ] && dir=$version/patches || dir=$version
+for patch in $(cat $dir/series | filter_names); do
+	# if patch already existed, use mysql- prefix
+	if [ -f mysql-$patch ]; then
+		file=mysql-$patch
+	else
+		file=$patch
+	fi
+	cat $dir/$patch | filter_files > $file
 
 	if [ -z "$(awk -vfile=$file -F/ '$2 == file{print}' CVS/Entries)" ]; then
 		cvs add $file
 		${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.4.3&r2=1.7.4.3.2.1&f=u