[Zaf-commit] SF.net SVN: zaf:[11038] trunk/po/fftb

[<dwa...@us...>]

Revision: 11038
          http://zaf.svn.sourceforge.net/zaf/?rev=11038&view=rev
Author:   dwaynebailey
Date:     2012-08-03 08:14:08 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
Pootle update caused manage.py relocation
Also leave pootle-terminology.po file alone

Modified Paths:
--------------
    trunk/po/fftb/get-from-pootle.sh
    trunk/po/fftb/push-to-pootle.sh

Modified: trunk/po/fftb/get-from-pootle.sh
===================================================================
--- trunk/po/fftb/get-from-pootle.sh	2012-08-03 07:56:25 UTC (rev 11037)
+++ trunk/po/fftb/get-from-pootle.sh	2012-08-03 08:14:08 UTC (rev 11038)
@@ -7,6 +7,7 @@
 user=pootlesync
 server=pootle.locamotion.org
 local_copy=.pootle_tmp
+manage_command="/var/www/sites/$instance/pootle/pootle/manage.py"
 manage_py_verbosity=2
 precommand=". /var/www/sites/mozilla/env/bin/activate;"
 
@@ -35,7 +36,7 @@
 
 option_project="--project=$project"
 
-sync_command="$precommand python /var/www/sites/$instance/Pootle/manage.py sync_stores --verbosity=$manage_py_verbosity $option_project $option_langs"
+sync_command="$precommand python $manage_command sync_stores --verbosity=$manage_py_verbosity $option_project $option_langs"
 pootle_dir=/var/www/sites/$instance/podirectory/$project
 
 # Sync project
@@ -43,7 +44,7 @@
 
 # Copy files across and disassemble phases
 mkdir -p $local_copy/$project
-rsync -az --delete --exclude=".translation_index" $user@$server:$pootle_dir/$bashlangs $local_copy/$project/ || exit
+rsync -az --delete --exclude=".translation_index" --exclude=pootle-terminology.po $user@$server:$pootle_dir/$bashlangs $local_copy/$project/ || exit
 
 svndir=$(pwd)
 cd $local_copy/$project

Modified: trunk/po/fftb/push-to-pootle.sh
===================================================================
--- trunk/po/fftb/push-to-pootle.sh	2012-08-03 07:56:25 UTC (rev 11037)
+++ trunk/po/fftb/push-to-pootle.sh	2012-08-03 08:14:08 UTC (rev 11038)
@@ -8,6 +8,7 @@
 server=pootle.locamotion.org
 local_copy=.pootle_phases_tmp
 phaselist=firefox.phaselist
+manage_command="/var/www/sites/$instance/pootle/pootle/manage.py"
 manage_py_verbosity=2
 precommand=". /var/www/sites/mozilla/env/bin/activate;"
 
@@ -29,8 +30,8 @@
 
 option_project="--project=$project"
 
-sync_command="$precommand python /var/www/sites/$instance/Pootle/manage.py sync_stores --verbosity=${manage_py_verbosity} $option_project $option_langs"
-update_command="$precommand python /var/www/sites/$instance/Pootle/manage.py update_stores $option_project"
+sync_command="$precommand python $manage_command sync_stores --verbosity=${manage_py_verbosity} $option_project $option_langs"
+update_command="$precommand python $manage_command update_stores $option_project"
 pootle_dir=/var/www/sites/$instance/podirectory/$project
 
 # Sync project
@@ -56,6 +57,6 @@
 for lang in $langs
 do
 	# FIXME only sync if we copied up correctly, this way we catch permission errors quickly
-	rsync -az --no-g --chmod=Dg+s,ug+rw,o-rw,Fug+rw,o-rw --include="*.po" --delete $local_copy/$lang $user@$server:$pootle_dir/
+	rsync -az --no-g --chmod=Dg+s,ug+rw,o-rw,Fug+rw,o-rw --include="*.po" --exclude=pootle-terminology.po --delete $local_copy/$lang $user@$server:$pootle_dir/
 	ssh $user@$server "$update_command --language=$lang"
 done

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.