Merge lp:~axino/codetree/unzip-overwrite into lp:codetree

Proposed by Junien F
Status: Merged
Approved by: Barry Price
Approved revision: 105
Merged at revision: 105
Proposed branch: lp:~axino/codetree/unzip-overwrite
Merge into: lp:codetree
Diff against target: 12 lines (+1/-1)
1 file modified
codetree/handlers/charm.py (+1/-1)
To merge this branch: bzr merge lp:~axino/codetree/unzip-overwrite
Reviewer Review Type Date Requested Status
Barry Price Approve
Review via email: mp+362717@code.launchpad.net

Commit message

To post a comment you must log in.
Revision history for this message
Barry Price (barryprice) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 105

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'codetree/handlers/charm.py'
2--- codetree/handlers/charm.py 2018-08-23 08:23:37 +0000
3+++ codetree/handlers/charm.py 2019-02-05 07:34:23 +0000
4@@ -138,7 +138,7 @@
5 logging.info("Downloading {} from charm store to {}".format(self.raw_source, dest))
6 zipped_path = self.cs_download(tmp_dir)
7 # Note python zipfile doesn't properly handle symbolic links use unzip instead
8- subprocess.check_output(['unzip', zipped_path, '-d', dest], stderr=subprocess.STDOUT, universal_newlines=True)
9+ subprocess.check_output(['unzip', '-o', zipped_path, '-d', dest], stderr=subprocess.STDOUT, universal_newlines=True)
10 return True
11 except Exception:
12 raise

Subscribers

People subscribed via source and target branches

to all changes: