SOURCES: rpm-find-lang - fix --all-name (thx Grzegorz Go³awski for...

glen glen at pld-linux.org
Mon Aug 28 20:45:36 CEST 2006


Author: glen                         Date: Mon Aug 28 18:45:36 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix --all-name (thx Grzegorz Goławski for pointing it out)

---- Files affected:
SOURCES:
   rpm-find-lang (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/rpm-find-lang
diff -u SOURCES/rpm-find-lang:1.12 SOURCES/rpm-find-lang:1.13
--- SOURCES/rpm-find-lang:1.12	Wed Aug  9 01:53:12 2006
+++ SOURCES/rpm-find-lang	Mon Aug 28 20:45:30 2006
@@ -13,6 +13,8 @@
 
 #changes:
 # $Id$
+# 2006-08-28 Elan Ruusamäe <glen at pld-linux.org>
+#   * fixed --all-name which got broken with last change.
 # 2006-08-09 Elan Ruusamäe <glen at pld-linux.org>
 #   * huge performance boost for packages calling %find_lang multiple times (kde*i18n)
 # 2001-01-08 Michał Kochanowicz <mkochano at pld.org.pl>
@@ -111,7 +113,7 @@
 		s:'"$TOP_DIR"'::' > __find.files
 fi
 
-fgrep $NAME __find.files | sed '
+{ [ "$ALL_NAME" ] || cat __find.files && fgrep $NAME __find.files; } | sed '
 '"$ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
 '"$NO_ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
 s:^\([^%].*\)::
@@ -121,7 +123,7 @@
 if [ ! -f __find.dirs ]; then
 	find $TOP_DIR -type d | sed 's:'"$TOP_DIR"'::' > __find.dirs
 fi
-fgrep $NAME __find.dirs | sed '
+{ [ "$ALL_NAME" ] || cat __find.dirs && fgrep $NAME __find.dirs; } | sed '
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/]\+\):%lang(\2) \1\2:
@@ -132,7 +134,7 @@
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
-fgrep $NAME __find.dirs | sed '
+{ [ "$ALL_NAME" ] || cat __find.dirs && fgrep $NAME __find.dirs; } | sed '
 '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
 '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-find-lang?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list