[Debian-l10n-commits] r1550 - /dl10n/trunk/pootle/sync-projects.d/20di

[bubulle at users.alioth.debian.org]

Author: bubulle
Date: Sat Jan 24 09:49:42 2009
New Revision: 1550

URL: http://svn.debian.org/wsvn/?sc=1&rev=1550
Log:
Clean out output for iso-codes (and other git repos)
Remove set -e that made the script fail too early

Modified:
    dl10n/trunk/pootle/sync-projects.d/20di

Modified: dl10n/trunk/pootle/sync-projects.d/20di
URL: http://svn.debian.org/wsvn/dl10n/trunk/pootle/sync-projects.d/20di?rev=1550&op=diff
==============================================================================
--- dl10n/trunk/pootle/sync-projects.d/20di (original)
+++ dl10n/trunk/pootle/sync-projects.d/20di Sat Jan 24 09:49:42 2009
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -e
 
 . `dirname "$0"`/cfg/common
 . `dirname "$0"`/cfg/`basename "$0"`
@@ -10,7 +9,7 @@
 
 echo "Updating Debian Installer..."
 for i in `find $DI -maxdepth 2 -mindepth 2 -type d | grep -v "\.svn"`; do 
-##	echo "Working on $i"
+	echo "Working on $i"
 	if [ -d "$i/.svn" ] ; then
 		cd "$i"
 		svn -q up
@@ -20,9 +19,11 @@
 	fi
 	if [ -d "$i/.git" ] ; then
 		cd "$i"
-		(git fetch ; git pull ; git rebase origin/master || git rebase origin/debian-unstable || git rebase master) | \
+		git fetch
+		git pull 2>&1 | grep -v "up-to-date"
+		(git rebase origin/master 2>&1 || git rebase origin/debian-unstable || git rebase master) | \
 		    grep -v "needs update" | \
-		    grep -v "Already" |Â \
+		    grep -v "Already" | \
 		    grep -v "up to date"
 	fi
 done