Merge lp://staging/~chipaca/snapweb/old-branches into lp://staging/~snappy-dev/snapweb/trunk
Proposed by
John Lenton
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~chipaca/snapweb/old-branches |
Merge into: | lp://staging/~snappy-dev/snapweb/trunk |
Diff against target: |
360 lines (+63/-108) 8 files modified
build.sh (+35/-9) dependencies.tsv (+3/-2) oem/oem.go (+4/-3) package.json (+1/-1) pkg/meta/hooks/config (+0/-70) pkg/meta/package.yaml (+2/-2) pkg/snappyd (+6/-1) snappy/converge.go (+12/-20) |
To merge this branch: | bzr merge lp://staging/~chipaca/snapweb/old-branches |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Schvezov | Approve | ||
Review via email: mp+275739@code.staging.launchpad.net |
Commit message
Misc fixes to get it working again, most of it already shipped as 0.9.2.
To post a comment you must log in.
Unmerged revisions
- 165. By John Lenton
-
bump snappy revision
- 164. By John Lenton
-
also nuke the now-useless config
- 163. By John Lenton
-
fxi typo
- 162. By John Lenton
-
silly tweaks to build and package
- 161. By John Lenton
-
update package version
- 160. By John Lenton
-
build again, ok? ta
The attempt to merge lp:~chipaca/webdm/old-branches into lp:webdm failed. Below is the output from the failed tests.
Checking formatting com/blakesmith/ ar failed; trying to fetch newer version com/cheggaaa/ pb failed; trying to fetch newer version com/blakesmith/ ar now at c9a977dd0cc1392 b023382c7bfa5a2 2af8d3b730 com/gorilla/ context failed; trying to fetch newer version com/cheggaaa/ pb now at e8c7cc515bfde3e 267957a3b110080 ceed51354e com/mvo5/ uboot-go failed; trying to fetch newer version com/gorilla/ context now at 50c25fb3b2b3b3c c724e9b6ac75fb4 4b3bccd0da com/mvo5/ uboot-go now at 69978a3e4b05cca 9d7cfee489b3453 dfed45e72c bcc6bd5a76287eb 75ea96c673 net/snappy failed; trying to fetch newer version 6fb6c4e0d370a05 f24a0bf213 com/davecheney/ gmx failed; trying to fetch newer version net/snappy now at snappy_ tarmac- 20151026170354- jjpx8mpqyss1ne5 p com/davecheney/ mdns failed; trying to fetch newer version com/davecheney/ gmx now at d765420e7fbacce cb2a38cf2a02701 fe3e0888a3 com/gorilla/ mux failed; trying to fetch newer version com/davecheney/ mdns now at de174d86a3d3e87 bfad9cb66cedd04 33380b67b0 com/gosexy/ gettext failed; trying to fetch newer version com/gorilla/ mux now at e444e69cbd2e2e3 e0749a2f3c717ce c491552bbf com/miekg/ dns failed; trying to fetch newer version com/gosexy/ gettext now at 98b7b91596d20b9 6909e6b60d57411 547dd9959c com/mvo5/ goconfigparser failed; trying to fetch newer version com/miekg/ dns now at 5a357a6fc5e8526 8b929350aa6423e 2d56dcc4ff com/mvo5/ goconfigparser now at 26426272dda20cc 76aa1fa44286dc7 43d2972fe8 uzvVgkq6aG/ src/launchpad. net/webdm net/webdm/ avahi 0.008s coverage: 60.0% of statements net/webdm/ cmd/snappyd [no test files] net/webdm/ oem [no test files] net/webdm/ snappy [build failed] net/webdm/ webprogress [no test files]
Installing godeps
Install golint
Obtaining dependencies
update github.
update github.
github.
update github.
github.
update github.
github.
update gopkg.in/check.v1 failed; trying to fetch newer version
github.
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5
update launchpad.
gopkg.in/yaml.v2 now at 49c95bdc2184325
update github.
launchpad.
update github.
github.
update github.
github.
update github.
github.
update github.
github.
update github.
github.
github.
Building
Running tests from /tmp/tmp.
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 60.0% of statements
ok launchpad.
? launchpad.
? launchpad.
FAIL launchpad.
? launchpad.
# 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 src/launchpad. net/webdm src/launchpad. net/webdm/ src/launchpad. net/webdm
mkdir -p $GOPATH/
cp -a . $GOPATH/
cd $GOPATH/
./run-checks com/davecheney/ gmx com/miekg/ dns net/snappy/ pkg com/mvo5/ goconfigparser net/snappy/ logger net/snappy/ helpers net/snappy/ coreconfig net/snappy/ dirs com/gosexy/ gettext com/davecheney/ mdns net/webdm/ avahi net/snappy/ oauth com/mvo5/ uboot-go/ uenv net/snappy/ partition net/snappy/ i18n com/blakesmith/ ar
github.
github.
gopkg.in/yaml.v2
launchpad.
github.
launchpad.
launchpad.
launchpad.
launchpad.
github.
github.
launchpad.
launchpad.
github.
launchpad.
launchpad.
github.
la...