[Lsb-messages] /var/www/bzr/lsb/devel/olver-core-tests r110: make java prereq string match less precise (bug 4105)

Mats Wichmann mats at linuxfoundation.org
Sun Jun 7 15:24:24 UTC 2015


------------------------------------------------------------
revno: 110
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: olver-core-tests
timestamp: Sun 2015-06-07 09:24:24 -0600
message:
  make java prereq string match less precise (bug 4105)
modified:
  build_prerequisites.sh
  package/Makefile
-------------- next part --------------
=== modified file 'build_prerequisites.sh'
--- a/build_prerequisites.sh	2012-02-13 21:09:32 +0000
+++ b/build_prerequisites.sh	2015-06-07 15:24:24 +0000
@@ -74,8 +74,9 @@
 fi
 
 # Java Runtime Environment
-JAVA_VERSION=`java -version 2>&1 | grep 'java version \"1\.[56789]'`
-JAVA_VERSION_2=`java -version 2>&1 | grep 'java version \"[23456789]\.[0123456789]'`
+# bug 4105: string compare made less precise, drop requirement for word "java"
+JAVA_VERSION=`java -version 2>&1 | grep 'version \"1\.[56789]'`
+JAVA_VERSION_2=`java -version 2>&1 | grep 'version \"[23456789]\.[0123456789]'`
 
 if [[ "_$JAVA_VERSION" != "_"  || "_$JAVA_VERSION_2" != "_" ]]
 then

=== modified file 'package/Makefile'
--- a/package/Makefile	2015-06-07 15:00:26 +0000
+++ b/package/Makefile	2015-06-07 15:24:24 +0000
@@ -1,6 +1,6 @@
 PACKAGE=lsb-test-olver-core
 VERSION=5.0.1
-BUILDNO=1
+BUILDNO=2
 
 # for pkgchk
 DEPS=



More information about the lsb-messages mailing list