Merge lp:~rbalint/livecd-rootfs/vmdk-path into lp:livecd-rootfs

Proposed by Balint Reczey
Status: Merged
Merged at revision: 1490
Proposed branch: lp:~rbalint/livecd-rootfs/vmdk-path
Merge into: lp:livecd-rootfs
Diff against target: 25 lines (+4/-1)
2 files modified
debian/changelog (+3/-0)
live-build/functions (+1/-1)
To merge this branch: bzr merge lp:~rbalint/livecd-rootfs/vmdk-path
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+327981@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

I know this has already been merged, but wouldn't it be more future proof to use 'python -m', or write a wrapper script that imports the module, so we're not dependent on a hard coded path?

Revision history for this message
Balint Reczey (rbalint) wrote :

We will still have to change it to python3 if we want to move to Python 3 but referencing the module name would indeed be nicer.
I'll send a MP after running a quick test.

Revision history for this message
Balint Reczey (rbalint) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-06-30 10:22:29 +0000
3+++ debian/changelog 2017-07-24 17:21:32 +0000
4@@ -12,6 +12,9 @@
5 * auto/config: enable Debug::pkgDepCache::AutoInstall so tracking down
6 dependency bugs in the livefs is a little clearer.
7
8+ [ Robert C Jennings ]
9+ * live-build/functions: Update path for VMDKstream.py (LP: #1706116)
10+
11 -- Balint Reczey <rbalint@ubuntu.com> Wed, 14 Jun 2017 18:25:32 +0200
12
13 livecd-rootfs (2.447) artful; urgency=medium
14
15=== modified file 'live-build/functions'
16--- live-build/functions 2017-06-14 16:25:15 +0000
17+++ live-build/functions 2017-07-24 17:21:32 +0000
18@@ -226,7 +226,7 @@
19 destination="$2"
20 size="${3:-10240}"
21
22- streamconverter="/usr/share/pyshared/VMDKstream.py"
23+ streamconverter="/usr/lib/python2.7/dist-packages/VMDKstream.py"
24 scratch_d=$(mktemp -d)
25 cp ${src} ${scratch_d}/resize.img
26

Subscribers

People subscribed via source and target branches