Charm Helpers

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

  1. fix-bzrurl-dest
  2. Merge into devel
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
1=== modified file 'charmhelpers/fetch/bzrurl.py'
2--- charmhelpers/fetch/bzrurl.py 2015-01-22 06:11:15 +0000
3+++ charmhelpers/fetch/bzrurl.py 2015-11-22 21:32:53 +0000
4@@ -64,11 +64,15 @@
5 except Exception as e:
6 raise e
7
8- def install(self, source):
9+ def install(self, source, dest=None):
10 url_parts = self.parse_url(source)
11 branch_name = url_parts.path.strip("/").split("/")[-1]
12- dest_dir = os.path.join(os.environ.get('CHARM_DIR'), "fetched",
13- branch_name)
14+ if dest:
15+ dest_dir = os.path.join(dest, branch_name)
16+ else:
17+ dest_dir = os.path.join(os.environ.get('CHARM_DIR'), "fetched",
18+ branch_name)
19+
20 if not os.path.exists(dest_dir):
21 mkdir(dest_dir, perms=0o755)
22 try:

Subscribers

People subscribed via source and target branches