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

[Sergio Schvezov]

Load the config before trying to run

[lp:~sergiusens/snapcraft/1498140]

189. By Sergio Schvezov on 2015-09-21

Load the config before trying to run

[Leo Arias (elopio)]

review: Approve (code review, test manually, test automatically)

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-20 14:34:08 +0000
+++ integration-tests/units/jobs.pxu	2015-09-21 19:23:22 +0000
@@ -7,6 +7,15 @@
     test $? = 1 || exit 1
     echo $OUTPUT | grep "Could not find snapcraft\.yaml\."
 
+id: snapcraft/normal/no-yaml-run
+plugin: shell
+estimated_duration: 0.1
+command:
+    set -x
+    OUTPUT=$(${SNAPCRAFT} run 2>&1)
+    test $? = 1 || exit 1
+    echo $OUTPUT | grep "Could not find snapcraft\.yaml\."
+
 id: snapcraft/normal/assemble-meta-externally
 plugin: shell
 estimated_duration: 0.3

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-09-21 19:23:22 +0000
+++ snapcraft/cmds.py	2015-09-21 19:23:22 +0000
@@ -137,6 +137,10 @@
 
 
 def run(args):
+    # We are mostly making sure we are operating from the correct location. In
+    # the future this could do more by using target attribute in snapcraft.yaml
+    # to create the correct target image.
+    _load_config()
     # Find the ssh key that ubuntu-device-flash would use so that we can use it
     # ourselves as well. This may not be the default key that the user has
     # configured.