Author: glen Date: Fri Nov 12 11:21:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rewrite code to handle recursion better
---- Files affected:
packages/rpm:
rpm-java-requires (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/rpm/rpm-java-requires
diff -u packages/rpm/rpm-java-requires:1.5 packages/rpm/rpm-java-requires:1.6
--- packages/rpm/rpm-java-requires:1.5 Thu Nov 11 21:13:25 2010
+++ packages/rpm/rpm-java-requires Fri Nov 12 12:21:38 2010
@@ -45,29 +45,18 @@
chmod -R u+rwX $tmp
# find .jar and .class files
- for file in $(find $tmp -type f '(' -name '*.class' -o -name '*.jar'
')'); do
- case "$file" in
- *.jar)
- # recursion!
- javajarversion "$file" || ret=1
- ;;
- *.class)
- javaclassversion "$file" || {
- echo >&2 "ERROR: Class version could not be
extracted from $file"
- ret=1
- }
- ;;
- esac
- done
- rm -rf $tmp
+ find_requires $(find $tmp -type f '(' -name '*.class' -o -name '*.jar'
')') || ret=1
+ rm -rf $tmp
return $ret
}
find_requires() {
set -$debug
local ret=0
- for file in $FILES; do
+
+ $FIND_JAVAREQ_DEBUG && echo >&2 ">> find_requires: $*"
+ for file in $@; do
case $file in
*.jar)
javajarversion "$file" || ret=1
@@ -78,16 +67,17 @@
ret=1
}
;;
+ *)
+ $FIND_JAVAREQ_DEBUG && echo >&2 ">> find_requires: no
handle: $file"
+ ;;
esac
done
return $ret
}
-FILES=$(cat -)
-
t=$(mktemp)
ret=0
-find_requires > $t || ret=1
+find_requires $(cat -) > $t || ret=1
sort -u $t
rm -f $t
exit $ret
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-java-requires?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
