Merge lp:~thedac/charm-helpers/volume-fixes into lp:charm-helpers

[David Ames]

Fix volume_map dictionary check. Correct hookenv and host imports in volumes.py

[Matthew Wedgwood (mew)]

Thanks, +1

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/volumes.py'
--- charmhelpers/contrib/charmsupport/volumes.py	2013-05-11 20:24:29 +0000
+++ charmhelpers/contrib/charmsupport/volumes.py	2013-07-01 18:48:23 +0000
@@ -40,8 +40,8 @@
 # - fstab is neither consulted nor updated
 
 import os
-import hookenv
-import host
+from charmhelpers.core import hookenv
+from charmhelpers.core import host
 import yaml
 
 
@@ -74,7 +74,7 @@
     if volume_map is None:
         # probably an empty string
         volume_map = {}
-    elif isinstance(volume_map, dict):
+    elif not isinstance(volume_map, dict):
         hookenv.log("Volume-map should be a dictionary, not {}".format(
             type(volume_map)))
         errors = True