Merge lp:~sergiusens/snapcraft/1497108 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Use relative paths for image creation

[Leo Arias (elopio)]

I don't understand this, but it works, so +1.

Should this be a bug on udf? or is something that python's exec causes?

review: Approve

[Sergio Schvezov (sergiusens)]

On Mon, Sep 21, 2015 at 8:38 PM, Leo Arias <email address hidden> wrote:

> Review: Approve
>
> I don't understand this, but it works, so +1.
>
> Should this be a bug on udf? or is something that python's exec causes?
>

I am thinking kpartx fails on char [MAXLEN] or something like that. I
forgot to assign it earlier in the report

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-09-18 16:59:41 +0000
+++ snapcraft/cmds.py	2015-09-21 18:50:34 +0000
@@ -163,13 +163,11 @@
     qemudir = os.path.join(os.getcwd(), "image")
     qemu_img = os.path.join(qemudir, "15.04.img")
     if not os.path.exists(qemu_img):
-            try:
-                os.makedirs(qemudir)
-            except FileExistsError:
-                pass
-            common.run(
-                ['sudo', 'ubuntu-device-flash', 'core', '--developer-mode', '--enable-ssh', '15.04', '-o', qemu_img],
-                cwd=qemudir)
+        os.makedirs(qemudir, exist_ok=True)
+        common.run([
+            'sudo', 'ubuntu-device-flash', 'core', '15.04', '--developer-mode',
+            '--enable-ssh', '-o', os.path.relpath(qemu_img, qemudir)],
+            cwd=qemudir)
     qemu = None
     try:
         # Allow the developer to provide additional arguments to qemu.  This