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

[Sergio Schvezov]

Config hook examples update

[Daniel Holbach (dholbach)]

Looks good!

review: Approve

[Sergio Schvezov (sergiusens)]

yay, dholbach needs to be in the snappy-dev team ;-)

review: Approve

=== modified file 'examples/webcam-webui/snapcraft.yaml'
--- examples/webcam-webui/snapcraft.yaml	2015-09-17 06:24:37 +0000
+++ examples/webcam-webui/snapcraft.yaml	2015-09-20 14:35:06 +0000
@@ -7,7 +7,7 @@
 services:
   - name: webcam-webui
     start: bin/webcam-webui
-config: python3 usr/bin/config.py
+config: usr/bin/config.py
 
 parts:
   cam:

=== modified file 'integration-tests/data/pypi-config/snapcraft.yaml'
--- integration-tests/data/pypi-config/snapcraft.yaml	2015-09-17 20:21:43 +0000
+++ integration-tests/data/pypi-config/snapcraft.yaml	2015-09-20 14:35:06 +0000
@@ -8,7 +8,7 @@
 
  This package will download its dependencies from pypi.
 icon: icon.png
-config: python3 usr/bin/config.py
+config: usr/bin/config.py
 
 parts:
   config:

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-18 19:06:34 +0000
+++ integration-tests/units/jobs.pxu	2015-09-20 14:35:06 +0000
@@ -93,7 +93,7 @@
     test -f ./snap/usr/bin/config.py
     test -f ./snap/usr/bin/python3
     test -f ./snap/meta/hooks/config
-    grep -q 'exec "python3" usr/bin/config.py $*' ./snap/meta/hooks/config
+    grep -q 'exec "usr/bin/config.py" $*' ./snap/meta/hooks/config
 
 id: snapcraft/normal/simple-make
 plugin: shell