X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=percona.sh;h=722a35a8a904ce1fd99205fc6348d4ed4347938d;hb=b99163f9be703d44a08d9f816779ab9dc29fdf4f;hp=0b6472e6a24b57b9a5aab80e02b6726cccac8a6f;hpb=b110cd1a81df40e1d087c56c7dcc31d17c1522d9;p=packages%2Fmysql.git

diff --git a/percona.sh b/percona.sh
index 0b6472e..722a35a 100644
--- a/percona.sh
+++ b/percona.sh
@@ -1,14 +1,17 @@
 #!/bin/sh
 # updates percona patches
-# http://www.percona.com/docs/wiki/release:start
+# http://www.percona.com/docs/wiki/repositories:start
+# 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=release-5.1.53-11
+version=5.5
 bzr_branch=lp:percona-server/$version
-branch=MYSQL_5_1
+#version=5.5.9
+#bzr_branch=lp:percona-dev/percona-server/$version
+branch=
 
 filter_names() {
-	# mysql_dump_ignore_ct.patch is broken, therefore we skip
-	grep -v 'mysql_dump_ignore_ct.patch' | \
 	grep -v 'percona-support.patch' | \
 	grep -v 'mysqld_safe_syslog.patch' | \
 	grep -v 'mysql-test.diff'
@@ -18,9 +21,11 @@ filter_files() {
 	filterdiff -x '*/configure'
 }
 
+set -e
+
 if [ -d $version ]; then
 	cd $version
-	bzr up
+	bzr pull
 	cd ..
 else
 	bzr branch $bzr_branch $version
@@ -29,16 +34,27 @@ fi
 > .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
 
-	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