[ooo-build-commit] Branch 'ooo-build-3-1' - bin/localize-ooo

[Petr Mladek]

 bin/localize-ooo |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 0c334ad7813c42941a4fbee51b7f9ec915d92f2d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 28 14:01:17 2009 +0200

    Really apply non-language-specific sdf files (n#507643)
    
    * bin/localize-ooo: fix filtering of already processed and non-wanted sdf
      files to apply all non-language-specific sdf files; It is needed for
      the last Kohei's fix (n#507643)

diff --git a/bin/localize-ooo b/bin/localize-ooo
index 78dc401..9db5865 100755
--- a/bin/localize-ooo
+++ b/bin/localize-ooo
@@ -150,9 +150,12 @@ for fn in `find $SRCDIR $DEB_GSIDIR $TOOLSDIR/po $SRCDIR_PIECE -name "*.sdf"` ;
     grep -q "^$fn$" $extra_trans_lang_list 2>/dev/null && continue;
     # skip if already merged
     grep -q "^$fn$" $extra_trans_stamp 2>/dev/null && continue;
-    if echo "$fn" | grep -q GSI && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'_' -f2)"; then continue; fi
-    if echo "$fn" | grep -q ooo-build && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'-' -f3)"; then continue; fi
-    if echo "$fn" | grep -q sc-langchooser && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'-' -f3)"; then continue; fi
+    # skip sdf-templates
+    echo "$fn" | grep -q "^$TOOLSDIR/po/sdf-templates" && continue;
+    echo "$fn" | grep -q "^$TOOLSDIR/po/ooo-build.sdf" && continue;
+    # skip exotic localizations that are not in $ALL_LANGS and thus not detected
+    echo "$fn" | grep -q "$SRCDIR/GSI" && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'_' -f2)" && continue;
+    echo "$fn" | grep -q "$TOOLSDIR/po/ooo-build" && ! echo $OOO_LANGS | grep -q "$(echo $(basename $fn) | cut -d'-' -f3)" && continue;
     merge_localization "$fn" "all" "$split_build" "$sdf_file_filter" || exit 1;
     echo "$fn" >>$extra_trans_stamp
 done