Canonical Click Reviewers tools

Merge lp:~dholbach/click-reviewers-tools/1514346 into lp:click-reviewers-tools

  1. 1514346
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-11-09
Status: Merged
Approved by: Daniel Holbach on 2015-11-09
Approved revision: 540
Merged at revision: 540
Proposed branch: lp:~dholbach/click-reviewers-tools/1514346
Merge into: lp:click-reviewers-tools
Diff against target: 20 lines (+4/-2)
1 file modified
clickreviews/cr_common.py (+4/-2)
To merge this branch: bzr merge lp:~dholbach/click-reviewers-tools/1514346
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve on 2015-11-09
Canonical Store Reviewers 2015-11-09 Pending
Review via email: mp+276961@code.launchpad.net

Commit Message

Pass absolute path of click or snap file - that way it's safe even if we chdir.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clickreviews/cr_common.py'
2--- clickreviews/cr_common.py 2015-10-27 16:03:56 +0000
3+++ clickreviews/cr_common.py 2015-11-09 08:54:18 +0000
4@@ -663,12 +663,14 @@
5 def _unpack_snap_squashfs(snap_pkg, dest):
6 '''Unpack a squashfs based snap package to dest'''
7 d = tempfile.mkdtemp(prefix='clickreview-')
8- return _unpack_cmd(['unsquashfs', '-f', '-d', d, snap_pkg], d, dest)
9+ return _unpack_cmd(['unsquashfs', '-f', '-d', d,
10+ os.path.abspath(snap_pkg)], d, dest)
11
12
13 def _unpack_click_deb(click_pkg, dest):
14 d = tempfile.mkdtemp(prefix='clickreview-')
15- return _unpack_cmd(['dpkg-deb', '-R', click_pkg, d], d, dest)
16+ return _unpack_cmd(['dpkg-deb', '-R',
17+ os.path.abspath(click_pkg), d], d, dest)
18
19
20 def unpack_click(fn, dest=None):

Subscribers

People subscribed via source and target branches