Merge lp:~stephen-stewart/snapweb/fix-snap-routing into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

fix snap routing/controller

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~stephen-stewart/webdm/fix-snap-routing into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/gorilla/mux failed; trying to fetch newer version
launchpad.net/snappy now at snappy_tarmac-20150507103214-pgd90adryua6v6wi
update github.com/juju/loggo failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
cp -a . $GOPATH/src/launchpad.net/webdm/
cd $GOPATH/src/launchpad.net/webdm

./run-checks
gopkg.in/yaml.v2
launchpad.net/webdm/oem
github.com/gorilla/context
github.com/gorilla/mux
github.com/mvo5/goconfigparser
github.com/blakesmith/ar
launchpad.net/snappy/helpers
launchpad.net/snappy/clickdeb
launchpad.net/snappy/coreconfig
github.com/juju/loggo
launchpad.net/snappy/logger
launchpad.net/snappy/partition
launchpad.net/snappy/policy
github.com/cheggaaa/pb
launchpad.net/snappy/progress
launchpad.net/snappy/release
launchpad.net/snappy/systemd
launchpad.net/snappy/snappy
launchpad.net/webdm/webprogress
launchpad.net/webdm/snappy
launchpad.net/webdm/cmd/snappyd
# launchpad.net/webdm/cmd/snappyd
/usr/lib/go/pkg/tool/linux_amd64/6l: running gcc failed: Cannot allocate memory

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~stephen-stewart/webdm/fix-snap-routing into lp:webdm failed. Below is the output from the failed tests.

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
mktemp: failed to create directory via template ‘~/tmp/tmp.XXXXXXXXXX’: No such file or directory
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/webdm
mkdir: cannot create directory ‘/src’: Permission denied

=== modified file 'www/src/js/controllers/snaps.js'
--- www/src/js/controllers/snaps.js	2015-05-06 21:41:39 +0000
+++ www/src/js/controllers/snaps.js	2015-05-07 20:34:31 +0000
@@ -8,7 +8,7 @@
 var rootChannel = Radio.channel('root');
 
 module.exports = {
-  snap: function(name, section) {
+  snap: function(id, section) {
     var snap = new Snap({id: id});
 
     snap.fetch({

=== modified file 'www/src/js/routers/router.js'
--- www/src/js/routers/router.js	2015-04-28 07:49:54 +0000
+++ www/src/js/routers/router.js	2015-05-07 20:34:31 +0000
@@ -35,7 +35,7 @@
   snap: new Marionette.AppRouter({
     controller: snapController,
     appRoutes: {
-      'snap/:name/(:section)': 'snap',
+      'snap/:id/(:section)': 'snap',
     }
   }),