Merge ~johnsca/charms/+source/basic:imports into ~bcsaller/charms/+source/basic:master

[Cory Johns]

Fixed import issues due to charms.reactive split

Unmerged commits

929f77a... by Cory Johns on 2015-08-11

Fixed import issues

diff --git a/hooks/config-changed b/hooks/config-changed
index 2ce463f..786acbc 100755
--- a/hooks/config-changed
+++ b/hooks/config-changed
@@ -10,5 +10,5 @@ sys.path.append('lib')
 #
 # See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
 # for more information on this pattern.
-from charmhelpers.core.reactive import main
+from charms.reactive import main
 main()
diff --git a/hooks/install b/hooks/install
index 2ce463f..786acbc 100755
--- a/hooks/install
+++ b/hooks/install
@@ -10,5 +10,5 @@ sys.path.append('lib')
 #
 # See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
 # for more information on this pattern.
-from charmhelpers.core.reactive import main
+from charms.reactive import main
 main()
diff --git a/hooks/start b/hooks/start
index 2ce463f..786acbc 100755
--- a/hooks/start
+++ b/hooks/start
@@ -10,5 +10,5 @@ sys.path.append('lib')
 #
 # See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
 # for more information on this pattern.
-from charmhelpers.core.reactive import main
+from charms.reactive import main
 main()
diff --git a/hooks/stop b/hooks/stop
index 2ce463f..786acbc 100755
--- a/hooks/stop
+++ b/hooks/stop
@@ -10,5 +10,5 @@ sys.path.append('lib')
 #
 # See https://jujucharms.com/docs/stable/getting-started-with-charms-reactive
 # for more information on this pattern.
-from charmhelpers.core.reactive import main
+from charms.reactive import main
 main()
diff --git a/reactive/main.py b/reactive/main.py
index a5be3c4..067c3d3 100644
--- a/reactive/main.py
+++ b/reactive/main.py
@@ -1,19 +1,22 @@
-from reactive import local
-
 from charmhelpers.core.hookenv import status_set
-from charmhelpers.core.reactive import hook
 from charmhelpers.core.unitdata import kv
-
 from charmhelpers.fetch import apt_install
 from charmhelpers.fetch import filter_installed_packages
 
+from charms.reactive import hook
+
+try:
+    from local import PACKAGES
+except ImportError:
+    PACKAGES = []
+
 
 db = kv()
 
 
 @hook('install')
 def install_packages():
-    if not db.get('installed'):
+    if PACKAGES and not db.get('installed'):
         status_set('maintenance', 'Installing packages')
-        apt_install(filter_installed_packages(local.PACKAGES))
+        apt_install(filter_installed_packages(PACKAGES))
         db.set('installed', True)