Index: update_translations =================================================================== --- update_translations +++ update_translations @@ -32,20 +32,20 @@ # no kde_qt in kf5 for i in $releases l10n; do vcs=`get_vcs $i` + branch=`get_branch $i` + modname=$i + i=`get_path $i` + if test -n "$NOUPDATE"; then if test "$vcs" = git; then - branch=`get_branch $i` - i=`get_path $i` if ! (cd $i && git reset $SVNQUIETFLAG --hard origin/$branch); then echo "ERROR: failed to switch to $branch in $i" fi fi continue fi test -z "$VERBOSE1" || echo "updating $i" - modname=$i - i=`get_path $i` if test ! -d $i; then case "$vcs" in svn) @@ -67,7 +67,6 @@ # cleanup the old branches git remote prune origin || echo "ERROR: pruning $i has failed!" git fetch $SVNQUIETFLAG || echo "ERROR: fetching $i has failed!" - branch=`get_branch $modname` fi ### TODO: perhaps we could combine cleanup/svn-clean/revert (One svn stat -u, if it fails cleanup and revert are called, otherwise only svn-cleanup is done.) if test -z "$NO_INITIAL_CLEANUP"; then