From d889d2ef265514dba48c580a3e6879ffe35bcdf5 Mon Sep 17 00:00:00 2001 From: David Ames Date: Fri, 8 Feb 2019 14:09:16 -0800 Subject: [PATCH] Update pre-install hooks to fail on error The pre-install operations may fail, yet that failure is not elevated to the user. This masks the failure and makes early package install issues difficult to troubleshoot. If the basic pre-install script fails, the charm should not proceed to later hooks as the requirements may not be met. Hashbangs for bash should specify -e (errexit) on all of the pre-install bash scripts. Change-Id: I3a404f8a4d1be24e3a16e8240ebe72371579f528 Closes-bug: #1815243 Partial-bug: #1815231 --- src/hooks/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/install b/src/hooks/install index 780bb71..9c2707c 100755 --- a/src/hooks/install +++ b/src/hooks/install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # Wrapper to deal with newer Ubuntu versions that don't have py2 installed # by default. @@ -9,7 +9,7 @@ check_and_install() { fi } -if [[ $(lsb_release -sc) -eq "trusty" ]]; then +if [[ "$(lsb_release -sc)" == "trusty" ]]; then juju-log "Enabling cloud archive to work around old trusty tools" # Add a random cloud archive for the Openstack python3 clients add-apt-repository --yes ppa:ubuntu-cloud-archive/mitaka-staging