From 144a6ffbe5fb8106cfc059211e4e07a2ca7b9149 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 1 Dec 2014 17:35:21 +0000
Subject: [PATCH] Add __init__.py to charmhelpers sync & perform sync to get
 fix for recent charmhelpers break

---
 charm-helpers-hooks.yaml       |  1 +
 hooks/charmhelpers/__init__.py | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index c401e72..4586c91 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,6 +1,7 @@
 branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
+    - __init__
     - core
     - fetch
     - contrib.storage.linux:
diff --git a/hooks/charmhelpers/__init__.py b/hooks/charmhelpers/__init__.py
index e69de29..b46e2e2 100644
--- a/hooks/charmhelpers/__init__.py
+++ b/hooks/charmhelpers/__init__.py
@@ -0,0 +1,22 @@
+# Bootstrap charm-helpers, installing its dependencies if necessary using
+# only standard libraries.
+import subprocess
+import sys
+
+try:
+    import six  # flake8: noqa
+except ImportError:
+    if sys.version_info.major == 2:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python-six'])
+    else:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python3-six'])
+    import six  # flake8: noqa
+
+try:
+    import yaml  # flake8: noqa
+except ImportError:
+    if sys.version_info.major == 2:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python-yaml'])
+    else:
+        subprocess.check_call(['apt-get', 'install', '-y', 'python3-yaml'])
+    import yaml  # flake8: noqa