From 56358d1d335bc59ad6af4fed675119ceb95a6ef9 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Fri, 8 Feb 2019 15:58:48 -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: If36f0df0a8be40c82cf2244584e9531ada005c92
Closes-bug: #1815243
Partial-bug: #1815231
---
 hooks/install | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hooks/install b/hooks/install
index 262631be..86d48855 100755
--- a/hooks/install
+++ b/hooks/install
@@ -1,9 +1,7 @@
-#!/bin/bash
+#!/bin/bash -e
 # Wrapper to deal with newer Ubuntu versions that don't have py2 installed
 # by default.
 
-set -e
-
 declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml' 'dnspython')
 
 check_and_install() {