Merge lp:~niedbalski/python-jujuclient/trunk into lp:~hazmat/python-jujuclient/trunk

[Jorge Niedbalski]

Added EnvironmentNotBootstrapped Exception, instead of raising a ValueError.

Unmerged revisions

35. By Jorge Niedbalski on 2014-05-08

Added EnvironmentNotBootstrapped instead of raising ValueError

=== modified file 'jujuclient.py'
--- jujuclient.py	2014-04-27 01:38:13 +0000
+++ jujuclient.py	2014-05-08 23:18:39 +0000
@@ -76,6 +76,15 @@
 log = logging.getLogger("jujuclient")
 
 
+class EnvironmentNotBootstrapped(Exception):
+
+    def __init__(self, environment):
+        self.environment = environment
+
+    def __str__(self):
+        return "Environment %s is not bootstrapped" % self.environment
+
+
 class AlreadyConnected(Exception):
     pass
 
@@ -323,7 +332,7 @@
             os.environ.get('JUJU_HOME', '~/.juju'))
         jenv = os.path.join(jhome, 'environments', '%s.jenv' % env_name)
         if not os.path.exists(jenv):
-            raise ValueError("Environment %s not bootstrapped" % env_name)
+            raise EnvironmentNotBootstrapped(env_name)
         with open(jenv) as fh:
             data = yaml.safe_load(fh.read())
             cert_path = os.path.join(jhome, '%s.ca')