summaryrefslogtreecommitdiffstats
path: root/jjb/vpp/include-raw-vpp-lite-build.sh
diff options
context:
space:
mode:
authorC.J. Collier <cjcollier@linuxfoundation.org>2016-07-21 13:33:56 -0700
committerC.J. Collier <cjcollier@linuxfoundation.org>2016-07-21 13:33:56 -0700
commitfac9dc9eb2bf3761d140e1d3ac5b621ce5ca5c0b (patch)
treea6ae91e198438489d044c13ca020b78f4395ddef /jjb/vpp/include-raw-vpp-lite-build.sh
parent0c5de29b8355e3e0ec73080f57f290e25a52fcfc (diff)
Ignoring failure in update-java-alternatives
* The script fails, though the failure can be ignored. http://askubuntu.com/questions/599105/using-alternatives-with-java-7-and-java-8-on-14-04-2-lts Change-Id: Ie7b70fb189505a46b6640f1a961001f0c75a21b5 Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
Diffstat (limited to 'jjb/vpp/include-raw-vpp-lite-build.sh')
-rw-r--r--jjb/vpp/include-raw-vpp-lite-build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/vpp/include-raw-vpp-lite-build.sh b/jjb/vpp/include-raw-vpp-lite-build.sh
index eca0761c9..9e1133afd 100644
--- a/jjb/vpp/include-raw-vpp-lite-build.sh
+++ b/jjb/vpp/include-raw-vpp-lite-build.sh
@@ -50,7 +50,7 @@ fi
# vpp build system that can occur on Ubuntu 14.04 when a user may
# have both java-7 and java-8 installed.
if [ ${OS} == ubuntu1404 ];then
- sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64
+ sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 || echo 'ignoring failure'
fi
make UNATTENDED=yes install-dep