diff options
| author | Joey Hess <joeyh@debian.org> | 2011-10-12 16:25:17 +0000 |
|---|---|---|
| committer | Joey Hess <joeyh@debian.org> | 2011-10-12 16:25:17 +0000 |
| commit | f69a21f96c9acc6e315f2e1c0e8c0f3765a7cca9 (patch) | |
| tree | afb21bbcba55e14e4dc4c70526e93a68d10d2bea | |
| parent | 1218a483dce14b1aec81927146b90e8a0c502df9 (diff) | |
| download | installation-guide-f69a21f96c9acc6e315f2e1c0e8c0f3765a7cca9.zip | |
avoid relying on deep .svn directories
Going away in svn 1.7. Instead, use svn info to test if a directory is
checked into svn.
| -rw-r--r-- | build/po_functions | 4 | ||||
| -rwxr-xr-x | scripts/create_xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/po_functions b/build/po_functions index c6b6ea2a3..7b6bea3dc 100644 --- a/build/po_functions +++ b/build/po_functions @@ -11,7 +11,7 @@ update_templates () { # Check whether language uses PO files for translation uses_po () { if [ -d "../po/$lang" ] ; then - if [ -d "../$lang/.svn" ] ; then + if [ -d "../$lang/" ] && svn info "../$lang" >/dev/null 2>&1 ; then echo "Warning: both PO files and XML files are present; ignoring PO files" else return 0 @@ -33,7 +33,7 @@ generate_xml () { clear_xml () { for lang in $languages; do - if [ -d ../po/$lang ] && [ ! -d ../$lang/.svn ]; then + if [ -d ../po/$lang ] && [ ! -d ../$lang/ ] && ! svn info ../$lang/ >/dev/null 2>&1 ; then rm -rf ../$lang fi done diff --git a/scripts/create_xml b/scripts/create_xml index 7ed3ca1eb..656ca1444 100755 --- a/scripts/create_xml +++ b/scripts/create_xml @@ -20,7 +20,7 @@ else fi SOURCEDIR="$WORKDIR/en" # Don't overwrite XML translations committed to SVN -if [ -d "./$language/.svn" ] ; then +if svn info "./$language/" >/dev/null 2>&1; then TARGETDIR="./$language.new" else TARGETDIR="./$language" |