Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoralanb
Thu, 01 Dec 2016 11:20:22 +0000
changeset 42291 b2b1baadc3db
parent 42290 78f42d447fc3 (current diff)
parent 42288 600cfdaa270a (diff)
child 42292 11f0a32a38f0
Merge
--- a/common/bin/compare.sh	Thu Dec 01 11:14:50 2016 +0000
+++ b/common/bin/compare.sh	Thu Dec 01 11:20:22 2016 +0000
@@ -1295,8 +1295,8 @@
         OTHER_JDK="$OTHER/images/jdk"
         OTHER_JRE="$OTHER/images/jre"
         echo "Selecting jdk images for compare"
-    elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk)" ] \
-        && [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk)" ]
+    elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk 2> /dev/null)" ] \
+        && [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk 2> /dev/null)" ]
     then
         echo "Selecting licensee images for compare"
         # Simply override the THIS and OTHER dir with the build dir from
jdk-sandbox