summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Toscano <ltoscano@redhat.com>2017-02-27 11:21:56 +0100
committerLuigi Toscano <ltoscano@redhat.com>2017-06-07 18:48:57 +0200
commita5f23ee26d75607de3dba3425512b3684062aad0 (patch)
treee967841237ef63081361042b563e7f8dc6c6e03d
parent7790e81a5c4bd9d66876258fe6d6becd9cbc6966 (diff)
Fix: DIB_RELEASE is not defined on CentOSstable/newton
Otherwise an "unbound variable" error is thrown. Change-Id: I1e29cce101e44fc82e27b5e7986101847be0da8d (cherry picked from commit 591bfed8f045b88b29c4c627e1c8106080dabd3a)
Notes
Notes (review): Code-Review+2: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Verified-1: Sahara Hadoop Cluster CI <elastic-hadoop-ci@mirantis.com> Workflow+1: Vitaly Gridnev <vgridnev@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 07 Jun 2017 18:53:21 +0000 Reviewed-on: https://review.openstack.org/471761 Project: openstack/sahara-image-elements Branch: refs/heads/stable/newton
-rwxr-xr-xelements/hadoop-mapr/install.d/41-scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/elements/hadoop-mapr/install.d/41-scala b/elements/hadoop-mapr/install.d/41-scala
index b9ed219..1f4cc3f 100755
--- a/elements/hadoop-mapr/install.d/41-scala
+++ b/elements/hadoop-mapr/install.d/41-scala
@@ -17,7 +17,7 @@ if [ "$RETURN_CODE" != "200" ]; then
17 echo "http://www.scala-lang.org is unreachable" && exit 1 17 echo "http://www.scala-lang.org is unreachable" && exit 1
18fi 18fi
19 19
20if [ "trusty" == "${DIB_RELEASE}" ]; then 20if [ "trusty" == "${DIB_RELEASE:-}" ]; then
21 # scala >= 2.12 for ubuntu depends on openjdk-8, not available on trusty 21 # scala >= 2.12 for ubuntu depends on openjdk-8, not available on trusty
22 VERSION=${DEF_VERSION} 22 VERSION=${DEF_VERSION}
23else 23else