Deploy of local git-based charms does not work

[Brad Crittenden]

Using juju-deployer on a local charm results in a git checkout to, e.g. trusty/trusty/mycharm. It then fails looking for trusty/metadata.yaml due to the extra level of the directory structure.

This patch written by Francesco Banconi may work:

=== modified file 'deployer/vcs.py'
--- deployer/vcs.py 2014-09-29 14:36:34 +0000
+++ deployer/vcs.py 2015-05-21 15:43:03 +0000
@@ -3,7 +3,10 @@

 from bzrlib.workingtree import WorkingTree

-from .utils import ErrorExit
+from .utils import (
+ ErrorExit,
+ mkdir,
+)

 class Vcs(object):
@@ -99,8 +102,12 @@
         self._call(params, self.err_update)

     def branch(self):
- params = ["git", "clone", "--depth", "1", self.origin, self.path]
- self._call(params, self.err_branch, os.path.dirname(self.path))
+ params = [
+ "git", "clone", "--depth", "1",
+ self.origin, os.path.basename(self.path)]
+ cwd = os.path.dirname(self.path)
+ mkdir(cwd)
+ self._call(params, self.err_branch, cwd)

     def is_modified(self):
         params = ["git", "status", "-s"]

[Whit Morriss (whitmo)]

this MP fixes this issue: https://code.launchpad.net/~whitmo/juju-deployer/git-clone-fix

[Tim Van Steenburgh (tvansteenburgh)]

@bac, would you mind re-testing with r148?

[Brad Crittenden (bac)]

Thanks for the fix Tim. Sorry I did not notice your feedback previously.