Merge lp:~mew/juju-deployer/branch-optional into lp:~gandelman-a/juju-deployer/trunk

[Matthew Wedgwood]

This change makes the "branch" value optional. If it is missing, deployer.py skips the branch/update/revno process and expects charms to be on-disk in the places it would have put them. This allows us to pre-build charms with payloads before deploying them.

=== modified file 'deployer.py'
--- deployer.py	2013-02-21 02:05:38 +0000
+++ deployer.py	2013-02-28 00:24:24 +0000
@@ -138,8 +138,11 @@
 for k in CHARMS.keys():
     charm_path = "%s/%s" % (series_store, k)
     debug_msg("Charm '%s' - using charm path '%s'" % (k, charm_path))
-    (branch, sep, revno) = CHARMS[k]["branch"].partition('@')
-    debug_msg("Branch: {}, revision: {}".format(branch, revno))
+    (branch, sep, revno) = CHARMS[k].get("branch", '').partition('@')
+    if branch:
+        debug_msg("Branch: {}, revision: {}".format(branch, revno))
+    else:
+        debug_msg("No remote branch specified")
     if os.path.exists(charm_path):
         if opts.no_local_mods:
             with cd(charm_path):
@@ -151,7 +154,7 @@
                     log.error("Aborting")
                     exit(1)
         debug_msg("Charm path exists @ %s." % charm_path)
-        if update_charms:
+        if update_charms and branch:
             debug_msg("Updating charm branch '%s'" % k)
             code = subprocess.call(
                     ["bzr", "pull", "-d", charm_path, '--remember', branch])
@@ -159,7 +162,7 @@
                 log.error("Could not update branch at {} from {}".format(
                         charm_path, branch))
                 exit(code)
-    else:
+    elif branch:
         print "- Cloning %s from %s" % (k, branch)
         subprocess.call(["bzr", "branch", branch, charm_path])
     if revno:
@@ -170,6 +173,9 @@
             log.error("Unable to check out branch revision {}".format(revno))
             exit(code)
     # load charms metadata
+    if not os.path.isdir(charm_path):
+        print "Branch for {} does not exist ({})".format(k, charm_path)
+        exit(1)
     mdf = open("%s/metadata.yaml" % charm_path, "r")
     debug_msg("Loading metadata from %s/metadata.yaml" % charm_path)
     CHARMS[k]["metadata"] = yaml.load(mdf)