packages: rpm/rpm-java-requires - simplify extension matching

glen glen at pld-linux.org
Fri Nov 12 12:23:23 CET 2010


Author: glen                         Date: Fri Nov 12 11:23:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify extension matching

---- Files affected:
packages/rpm:
   rpm-java-requires (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/rpm/rpm-java-requires
diff -u packages/rpm/rpm-java-requires:1.6 packages/rpm/rpm-java-requires:1.7
--- packages/rpm/rpm-java-requires:1.6	Fri Nov 12 12:21:38 2010
+++ packages/rpm/rpm-java-requires	Fri Nov 12 12:23:18 2010
@@ -45,8 +45,7 @@
 	chmod -R u+rwX $tmp
 
 	# find .jar and .class files
-	find_requires $(find $tmp -type f '(' -name '*.class' -o -name '*.jar' ')') || ret=1
-
+	find_requires $(find $tmp -type f -regex '^.+\.(class|jar)$') || ret=1
 	rm -rf $tmp
 	return $ret
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-java-requires?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list