From be74c0fd1c6ebfc4d5da1f6e583abc8047438e0c Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Fri, 8 Feb 2019 15:28:41 -0600 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: I6e015c2e0a28f9b990bfd7b84a2317d339abbb4e Closes-bug: #1815243 Partial-bug: #1815231 --- hooks/install | 2 +- hooks/install_deps | 2 +- hooks/upgrade-charm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks/install b/hooks/install index 9a2f9353..e8ad54b4 100755 --- a/hooks/install +++ b/hooks/install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # ensure that the python3 bits are installed, whichever version of ubunut # is being installed. diff --git a/hooks/install_deps b/hooks/install_deps index bb600820..c480f29e 100755 --- a/hooks/install_deps +++ b/hooks/install_deps @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # Wrapper to ensure that python dependencies are installed before we get into # the python part of the hook execution diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm index 6f3d75b4..a454f76f 100755 --- a/hooks/upgrade-charm +++ b/hooks/upgrade-charm @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # Wrapper to ensure that old python bytecode isn't hanging around # after we upgrade the charm with newer libraries rm -rf **/*.pyc