[Debian-l10n-commits] r1545 - in /dl10n/trunk/pootle/sync-projects.d: 10debconf 20di 30sync
bubulle at users.alioth.debian.org
bubulle at users.alioth.debian.org
Sat Jan 24 06:40:35 UTC 2009
Author: bubulle
Date: Sat Jan 24 06:40:34 2009
New Revision: 1545
URL: http://svn.debian.org/wsvn/?sc=1&rev=1545
Log:
Resync with what's in production
Modified:
dl10n/trunk/pootle/sync-projects.d/10debconf
dl10n/trunk/pootle/sync-projects.d/20di
dl10n/trunk/pootle/sync-projects.d/30sync
Modified: dl10n/trunk/pootle/sync-projects.d/10debconf
URL: http://svn.debian.org/wsvn/dl10n/trunk/pootle/sync-projects.d/10debconf?rev=1545&op=diff
==============================================================================
--- dl10n/trunk/pootle/sync-projects.d/10debconf (original)
+++ dl10n/trunk/pootle/sync-projects.d/10debconf Sat Jan 24 06:40:34 2009
@@ -5,7 +5,7 @@
. `dirname $0`/cfg/common
. `dirname $0`/cfg/`basename $0`
-echo "`basename $0`: Updating debconf translations..."
+##echo "`basename $0`: Updating debconf translations..."
TMPDIR=/srv/pootle.debian.net/tmp
export TMPDIR
@@ -17,7 +17,7 @@
[ -f "$TARBALL" ] || exit 1
# First we extract the tarball in the temporary directory
-echo " Extracting files from $TARBALL..."
+##echo " Extracting files from $TARBALL..."
cd "$TEMPDIR"
umask 002
tar xfz "$TARBALL"
@@ -25,7 +25,7 @@
rm -rf po
# Then we extract the PO Files
-echo " Uncompress/update/check extracted files..."
+##echo " Uncompress/update/check extracted files..."
for pkg in `find . -mindepth 3 -maxdepth 3 -type d` ; do
# Files are originally in debian/po. Move them in the root
# of the directory
@@ -102,21 +102,21 @@
# Let's do some cleaning'
# When there are known broken files, let's clean them
-echo " Cleaning out broken files..."
+##echo " Cleaning out broken files..."
for file in $BROKEN; do
- echo " $file"
+## echo " $file"
rm "$POOTLEDEBCONFDIR/$file"
done
# Some packages should be ignored for various reasons
-echo " Cleaning out ignored packages..."
+##echo " Cleaning out ignored packages..."
for pkg in $IGNORE; do
- echo " $pkg"
+## echo " $pkg"
rm -rf `find "$POOTLEDEBCONFDIR" -mindepth 3 -maxdepth 3 -name "$pkg"` #2>/dev/null
done
# And some packages provide useless garbage
-echo " Cleaning out garbage..."
+##echo " Cleaning out garbage..."
for dir in $GARBAGE; do
echo " $dir"
rm -rf "$POOTLEDEBCONFDIR/$dir"
@@ -130,7 +130,7 @@
# Now we fill in all packages directories with one file per language
# That's slightly suboptimal but this is the only way to have correct
# statistics in Pootle
-echo " Updating Pootle files..."
+##echo " Updating Pootle files..."
for pkg in `find "$POOTLEDEBCONFDIR" -maxdepth 3 -mindepth 3 -type d | grep -v \\.svn` ; do
for lang in $LANGUAGES; do
if [ ! -f "$pkg/$lang.po" ] ; then
@@ -143,7 +143,7 @@
# Now commit the whole stuff to SVN
-echo " Committing to SVN..."
+##echo " Committing to SVN..."
cd "$POOTLEDEBCONFDIR"
svn -q up
# echo " Committing updated files"
@@ -159,17 +159,24 @@
# Now we need to find out what directories are in $POOTLEDEBCONFDIR but
# aren't anymore in the tarball. Most of the time, this will be
# packages that dropped po-debconf support
-echo " Finding added/removed files/directories..."
+##echo " Finding added/removed files/directories..."
cd "$POOTLEDEBCONFDIR"
find . -mindepth 3 -maxdepth 3 -type d | grep -v \\.svn | sort > "$TMPDIR/list-pootle"
cd "$TEMPDIR"
find . -mindepth 3 -maxdepth 3 -type d | sort > "$TMPDIR/list-tarball"
# We display the diff. It will be up to a human to delete/add
# the relevant dirs in SVN (too dangerous)
-diff -d -I "lintian" -I "powertweak" "$TMPDIR/list-tarball" "$TMPDIR/list-pootle" || true
+diff -d -I "lintian" -I "powertweak" "$TMPDIR/list-tarball" "$TMPDIR/list-pootle" > "$TMPDIR/diff" || true
+if [ -n "`cat $TMPDIR/diff`" ] ; then
+ cd "$POOTLEDEBCONFDIR"
+ echo " SVN commands to issue:"
+ for i in `grep -E "^>" "$TMPDIR/diff" | cut -f2 -d" "` ; do
+ echo svn rm --force $i
+ done
+fi
# Cleaning out
#Temporarily disabled to solve out a few issues
-#rm "$TMPDIR/list-tarball" "$TMPDIR/list-pootle" >/dev/null 2>&1 || true
+rm "$TMPDIR/list-tarball" "$TMPDIR/list-pootle" >/dev/null 2>&1 || true
rm -rf "$TEMPDIR" >/dev/null 2>&1 || true
Modified: dl10n/trunk/pootle/sync-projects.d/20di
URL: http://svn.debian.org/wsvn/dl10n/trunk/pootle/sync-projects.d/20di?rev=1545&op=diff
==============================================================================
--- dl10n/trunk/pootle/sync-projects.d/20di (original)
+++ dl10n/trunk/pootle/sync-projects.d/20di Sat Jan 24 06:40:34 2009
@@ -10,7 +10,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,19 +20,20 @@
fi
if [ -d "$i/.git" ] ; then
cd "$i"
- git fetch ; git rebase origin/master
- git fetch ; git rebase origin/debian-unstable
+ git fetch ; git pull ; git rebase origin/master || git rebase origin/debian-unstable || git rebase master
fi
done
-echo "Updating file permissions..."
+##echo "Updating file permissions..."
find "$DI" | xargs chmod g+w >/dev/null 2>&1
-echo "Cleaning..."
+##echo "Cleaning..."
cd "$DI"
for i in \
- level2/iso-codes/iso_3166_2
+ level5/debconf/doc
+# level2/iso-codes/iso_3166_2
do
rm -rf "$i"
done
+exit 0
Modified: dl10n/trunk/pootle/sync-projects.d/30sync
URL: http://svn.debian.org/wsvn/dl10n/trunk/pootle/sync-projects.d/30sync?rev=1545&op=diff
==============================================================================
--- dl10n/trunk/pootle/sync-projects.d/30sync (original)
+++ dl10n/trunk/pootle/sync-projects.d/30sync Sat Jan 24 06:40:34 2009
@@ -2,7 +2,7 @@
set -e
-echo "Refreshing Pootle stats..."
+## echo "Refreshing Pootle stats..."
cd /var/tmp
sudo -u pootle /usr/sbin/PootleServer --refreshstats
More information about the Debian-l10n-commits
mailing list