Merge lp:~marcoceppi/charm-helpers/fix-bzrurl-dest into lp:charm-helpers

Proposed by Marco Ceppi
Status: Merged
Merged at revision: 488
Proposed branch: lp:~marcoceppi/charm-helpers/fix-bzrurl-dest
Merge into: lp:charm-helpers
Diff against target: 22 lines (+7/-3)
1 file modified
charmhelpers/fetch/bzrurl.py (+7/-3)
To merge this branch: bzr merge lp:~marcoceppi/charm-helpers/fix-bzrurl-dest
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+278271@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charmhelpers/fetch/bzrurl.py'
--- charmhelpers/fetch/bzrurl.py 2015-01-22 06:11:15 +0000
+++ charmhelpers/fetch/bzrurl.py 2015-11-22 21:32:53 +0000
@@ -64,11 +64,15 @@
64 except Exception as e:64 except Exception as e:
65 raise e65 raise e
6666
67 def install(self, source):67 def install(self, source, dest=None):
68 url_parts = self.parse_url(source)68 url_parts = self.parse_url(source)
69 branch_name = url_parts.path.strip("/").split("/")[-1]69 branch_name = url_parts.path.strip("/").split("/")[-1]
70 dest_dir = os.path.join(os.environ.get('CHARM_DIR'), "fetched",70 if dest:
71 branch_name)71 dest_dir = os.path.join(dest, branch_name)
72 else:
73 dest_dir = os.path.join(os.environ.get('CHARM_DIR'), "fetched",
74 branch_name)
75
72 if not os.path.exists(dest_dir):76 if not os.path.exists(dest_dir):
73 mkdir(dest_dir, perms=0o755)77 mkdir(dest_dir, perms=0o755)
74 try:78 try:

Subscribers

People subscribed via source and target branches