goget-ubuntu-touch

Merge lp:~sergiusens/goget-ubuntu-touch/snappy-catchup into lp:goget-ubuntu-touch

  1. snappy-catchup
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 218
Merged at revision: 216
Proposed branch: lp:~sergiusens/goget-ubuntu-touch/snappy-catchup
Merge into: lp:goget-ubuntu-touch
Diff against target: 96 lines (+15/-14)
4 files modified
dependencies.tsv (+2/-2)
ubuntu-device-flash/core.go (+1/-1)
ubuntu-device-flash/snappy.go (+11/-10)
ubuntu-emulator/snapshot.go (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/goget-ubuntu-touch/snappy-catchup
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+276985@code.launchpad.net

Commit message

Catchup with snappy upstream changes

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

\o/

review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

The attempt to merge lp:~sergiusens/goget-ubuntu-touch/snappy-catchup into lp:goget-ubuntu-touch failed. Below is the output from the failed tests.

Checking formatting
Formatting wrong in following files
ubuntu-device-flash/snappy.go

# 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/goget-ubuntu-touch
cp -a . $GOPATH/src/launchpad.net/goget-ubuntu-touch
cd $GOPATH/src/launchpad.net/goget-ubuntu-touch

./run-checks

Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :
Download full text (3.3 KiB)

The attempt to merge lp:~sergiusens/goget-ubuntu-touch/snappy-catchup into lp:goget-ubuntu-touch failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/gosexy/gettext failed; trying to fetch newer version
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update launchpad.net/gocheck failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/blakesmith/ar failed; trying to fetch newer version
launchpad.net/gocheck now at <email address hidden>
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at 8bd4349a67f2533b078dbc524689d15dba0f4659
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/cheggaaa/pb now at da1f27ad1d9509b16f65f52fd9d8138b0f2dc7b2
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4
update gopkg.in/yaml.v2 failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 69978a3e4b05cca9d7cfee489b3453dfed45e72c
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 7ad95dd0798a40da1ccdff6dff35fd177b5edf40
launchpad.net/snappy now at <email address hidden>
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/goget-ubuntu-touch
cp -a . $GOPATH/src/launchpad.net/goget-ubuntu-touch
cd $GOPATH/src/launchpad.net/goget-ubuntu-touch

./run-checks
ubuntu-device-flash/snappy.go:23:2: cannot find package "github.com/ubuntu-core/snappy/dirs" in any of:
 /usr/lib/go/src/pkg/github.com/ubuntu-core/snappy/dirs (from $GOROOT)
 /tmp/tmp.Cb2FPpCGJu/src/github.com/ubuntu-core/snappy/dirs (from $GOPATH)
ubuntu-device-flash/core.go:21:2: cannot find package "github.com/ubuntu-core/snappy/helpers" in any of:
 /usr/lib/go/src/pkg/github.com/ubuntu-core/snappy/helpers (from $GOROOT)
 /tmp/tmp.Cb2FPpCGJu/src/github.com/ubuntu-core/snappy/helpers (from $GOPATH)
ubuntu-device-flash/snappy.go:25:2: cannot find package "github.com/ubuntu-core/snappy/progress" in any of:
 /usr/lib/go/src/pkg/github.com/ubuntu-core/snappy/progress (from $GOROOT)
 /tmp/tmp.Cb2FPpCGJu/src/github.com/ubuntu-core/snappy/progress (from $GOPATH)
ubuntu-device-flash/snappy.go:26:2: cannot find package "github.com/ubuntu-core/snappy/provisioning" in any of:
 /usr/lib/go/src/pkg/github.com/ubuntu-core/snappy/provisioning (from $GOROOT)
 /tmp/tmp.Cb2FPpCGJu/src/github.com/ubuntu-core/snappy/provisioning (from $GOPATH)
ubuntu-device-flash/snappy.go:27:2: cannot find package "github.com/ubuntu-core/snappy/release" in any of:
 /usr/lib/go/src/pkg/github.com/ubuntu-core/snappy/release (from $GOROOT)
 /tmp/tmp.Cb2FPpCGJu/src/github.com/ubuntu-core/snappy/release (from $GOPATH)
ubuntu-device-flash/snappy.go:28:2: ...

Read more...

lp:~sergiusens/goget-ubuntu-touch/snappy-catchup updated
217. By Sergio Schvezov

updated deps

218. By Sergio Schvezov

fixed new issue found by vet

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dependencies.tsv'
2--- dependencies.tsv 2015-09-09 14:43:17 +0000
3+++ dependencies.tsv 2015-11-09 12:50:20 +0000
4@@ -1,9 +1,9 @@
5 github.com/blakesmith/ar git 8bd4349a67f2533b078dbc524689d15dba0f4659 2015-03-11T14:59:44Z
6 github.com/cheggaaa/pb git da1f27ad1d9509b16f65f52fd9d8138b0f2dc7b2 2015-08-13T11:06:09Z
7 github.com/gosexy/gettext git 98b7b91596d20b96909e6b60d57411547dd9959c 2013-02-21T11:21:43Z
8-github.com/jessevdk/go-flags git 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4 2015-08-16T10:05:21Z
9+github.com/jessevdk/go-flags git 4047bd797dd935ae2b557a79cc43f223066c9659 2015-10-18T21:15:10Z
10 github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z
11 github.com/mvo5/uboot-go git 69978a3e4b05cca9d7cfee489b3453dfed45e72c 2015-07-23T08:17:10Z
12+github.com/ubuntu-core/snappy git 55b7cffec309684b0c875ab5d67028a431a85ba9 2015-11-04T00:02:50Z
13 gopkg.in/yaml.v2 git 7ad95dd0798a40da1ccdff6dff35fd177b5edf40 2015-06-24T10:29:02Z
14 launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 87
15-launchpad.net/snappy bzr michael.vogt@ubuntu.com-20150909122953-mo6fen3hh907sh2g 660
16
17=== modified file 'ubuntu-device-flash/core.go'
18--- ubuntu-device-flash/core.go 2015-09-09 18:43:06 +0000
19+++ ubuntu-device-flash/core.go 2015-11-09 12:50:20 +0000
20@@ -18,7 +18,7 @@
21 "strings"
22 "time"
23
24- "launchpad.net/snappy/helpers"
25+ "github.com/ubuntu-core/snappy/helpers"
26 )
27
28 // This program is free software: you can redistribute it and/or modify it
29
30=== modified file 'ubuntu-device-flash/snappy.go'
31--- ubuntu-device-flash/snappy.go 2015-09-16 11:13:20 +0000
32+++ ubuntu-device-flash/snappy.go 2015-11-09 12:50:20 +0000
33@@ -20,15 +20,16 @@
34 "syscall"
35 "time"
36
37+ "github.com/ubuntu-core/snappy/dirs"
38+ "github.com/ubuntu-core/snappy/helpers"
39+ "github.com/ubuntu-core/snappy/progress"
40+ "github.com/ubuntu-core/snappy/provisioning"
41+ "github.com/ubuntu-core/snappy/release"
42+ "github.com/ubuntu-core/snappy/snappy"
43 "gopkg.in/yaml.v2"
44 "launchpad.net/goget-ubuntu-touch/diskimage"
45 "launchpad.net/goget-ubuntu-touch/sysutils"
46 "launchpad.net/goget-ubuntu-touch/ubuntuimage"
47- "launchpad.net/snappy/helpers"
48- "launchpad.net/snappy/progress"
49- "launchpad.net/snappy/provisioning"
50- "launchpad.net/snappy/release"
51- "launchpad.net/snappy/snappy"
52 )
53
54 type imageFlavor string
55@@ -159,14 +160,14 @@
56 }
57
58 func (s *Snapper) install(systemPath string) error {
59- snappy.SetRootDir(systemPath)
60- defer snappy.SetRootDir("/")
61+ dirs.SetRootDir(systemPath)
62+ defer dirs.SetRootDir("/")
63
64 flags := s.installFlags()
65 oemSoftware := s.oem.OEM.Software
66 packageCount := len(s.Development.Install) + len(oemSoftware.BuiltIn) + len(oemSoftware.Preinstalled)
67 if s.Oem != "" {
68- packageCount += 1
69+ packageCount++
70 }
71 packageQueue := make([]string, 0, packageCount)
72
73@@ -206,8 +207,8 @@
74
75 s.stagingRootPath = tempDir
76
77- snappy.SetRootDir(tempDir)
78- defer snappy.SetRootDir("/")
79+ dirs.SetRootDir(tempDir)
80+ defer dirs.SetRootDir("/")
81 release.Override(release.Release{
82 Flavor: string(s.flavor),
83 Series: s.Positional.Release,
84
85=== modified file 'ubuntu-emulator/snapshot.go'
86--- ubuntu-emulator/snapshot.go 2014-10-09 12:18:37 +0000
87+++ ubuntu-emulator/snapshot.go 2015-11-09 12:50:20 +0000
88@@ -77,7 +77,7 @@
89 }
90 }
91 } else {
92- errors.New("Command not implemented or supported")
93+ return errors.New("Command not implemented or supported")
94 }
95
96 return nil

Subscribers

People subscribed via source and target branches