Merge lp:~martin-hilton/juju-deployer/git-clone-fix into lp:juju-deployer

[Martin Hilton]

I was having trouble with git clones so I put together a quick fix.

[Kapil Thangavelu (hazmat)]

a related fix was merged, and released with deployer 0.4.3 (pypi)

=== modified file 'deployer/vcs.py'
--- deployer/vcs.py	2014-04-21 22:49:05 +0000
+++ deployer/vcs.py	2014-09-26 10:18:19 +0000
@@ -99,8 +99,11 @@
         self._call(params, self.err_update)
 
     def branch(self):
-        params = ["git", "clone", "--depth", "1", self.branch]
-        self._call(params, self.err_branch, os.path.dirname(self.path))
+        params = ["git", "clone", "--depth", "1", self.origin, self.path]
+        cwd = os.path.dirname(os.path.dirname(self.path))
+        if not cwd:
+            cwd = "."
+        self._call(params, self.err_branch, cwd)
 
     def is_modified(self):
         params = ["git", "stat", "-s"]