From a62a1e5adbef470c07a869a98e9139881a6d226a Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chmacnaughton@gmail.com>
Date: Mon, 3 Oct 2016 13:14:04 -0400
Subject: [PATCH] Remove the compiled python bytecode

upgrade-charm could previously fail because of compiled bytecode
remaining behind. This change makes the upgrade-charm hook remove
any such compiled bytecode files

Change-Id: I1cb6521cab1ac0d529907d44f1e9bdb313a798ac
Closes-Bug: 1628322
---
 hooks/ceph_hooks.py      | 2 +-
 hooks/upgrade-charm      | 7 ++++++-
 hooks/upgrade-charm.real | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
 mode change 120000 => 100755 hooks/upgrade-charm
 create mode 120000 hooks/upgrade-charm.real

diff --git a/hooks/ceph_hooks.py b/hooks/ceph_hooks.py
index 56c2585..62babc7 100755
--- a/hooks/ceph_hooks.py
+++ b/hooks/ceph_hooks.py
@@ -506,7 +506,7 @@ def client_relation_changed():
         log('mon cluster not in quorum', level=DEBUG)
 
 
-@hooks.hook('upgrade-charm')
+@hooks.hook('upgrade-charm.real')
 @harden()
 def upgrade_charm():
     emit_cephconf()
diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
deleted file mode 120000
index 52d9663..0000000
--- a/hooks/upgrade-charm
+++ /dev/null
@@ -1 +0,0 @@
-ceph_hooks.py
\ No newline at end of file
diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
new file mode 100755
index 0000000..440473d
--- /dev/null
+++ b/hooks/upgrade-charm
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Wrapper to ensure that old python bytecode isn't hanging around
+# after we upgrade the charm with newer libraries
+rm -rf **/*.pyc
+
+exec ./hooks/upgrade-charm.real
diff --git a/hooks/upgrade-charm.real b/hooks/upgrade-charm.real
new file mode 120000
index 0000000..52d9663
--- /dev/null
+++ b/hooks/upgrade-charm.real
@@ -0,0 +1 @@
+ceph_hooks.py
\ No newline at end of file