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
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2015-09-09 14:43:17 +0000
+++ dependencies.tsv 2015-11-09 12:50:20 +0000
@@ -1,9 +1,9 @@
1github.com/blakesmith/ar git 8bd4349a67f2533b078dbc524689d15dba0f4659 2015-03-11T14:59:44Z1github.com/blakesmith/ar git 8bd4349a67f2533b078dbc524689d15dba0f4659 2015-03-11T14:59:44Z
2github.com/cheggaaa/pb git da1f27ad1d9509b16f65f52fd9d8138b0f2dc7b2 2015-08-13T11:06:09Z2github.com/cheggaaa/pb git da1f27ad1d9509b16f65f52fd9d8138b0f2dc7b2 2015-08-13T11:06:09Z
3github.com/gosexy/gettext git 98b7b91596d20b96909e6b60d57411547dd9959c 2013-02-21T11:21:43Z3github.com/gosexy/gettext git 98b7b91596d20b96909e6b60d57411547dd9959c 2013-02-21T11:21:43Z
4github.com/jessevdk/go-flags git 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4 2015-08-16T10:05:21Z4github.com/jessevdk/go-flags git 4047bd797dd935ae2b557a79cc43f223066c9659 2015-10-18T21:15:10Z
5github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z5github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z
6github.com/mvo5/uboot-go git 69978a3e4b05cca9d7cfee489b3453dfed45e72c 2015-07-23T08:17:10Z6github.com/mvo5/uboot-go git 69978a3e4b05cca9d7cfee489b3453dfed45e72c 2015-07-23T08:17:10Z
7github.com/ubuntu-core/snappy git 55b7cffec309684b0c875ab5d67028a431a85ba9 2015-11-04T00:02:50Z
7gopkg.in/yaml.v2 git 7ad95dd0798a40da1ccdff6dff35fd177b5edf40 2015-06-24T10:29:02Z8gopkg.in/yaml.v2 git 7ad95dd0798a40da1ccdff6dff35fd177b5edf40 2015-06-24T10:29:02Z
8launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 879launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 87
9launchpad.net/snappy bzr michael.vogt@ubuntu.com-20150909122953-mo6fen3hh907sh2g 660
1010
=== modified file 'ubuntu-device-flash/core.go'
--- ubuntu-device-flash/core.go 2015-09-09 18:43:06 +0000
+++ ubuntu-device-flash/core.go 2015-11-09 12:50:20 +0000
@@ -18,7 +18,7 @@
18 "strings"18 "strings"
19 "time"19 "time"
2020
21 "launchpad.net/snappy/helpers"21 "github.com/ubuntu-core/snappy/helpers"
22)22)
2323
24// This program is free software: you can redistribute it and/or modify it24// This program is free software: you can redistribute it and/or modify it
2525
=== modified file 'ubuntu-device-flash/snappy.go'
--- ubuntu-device-flash/snappy.go 2015-09-16 11:13:20 +0000
+++ ubuntu-device-flash/snappy.go 2015-11-09 12:50:20 +0000
@@ -20,15 +20,16 @@
20 "syscall"20 "syscall"
21 "time"21 "time"
2222
23 "github.com/ubuntu-core/snappy/dirs"
24 "github.com/ubuntu-core/snappy/helpers"
25 "github.com/ubuntu-core/snappy/progress"
26 "github.com/ubuntu-core/snappy/provisioning"
27 "github.com/ubuntu-core/snappy/release"
28 "github.com/ubuntu-core/snappy/snappy"
23 "gopkg.in/yaml.v2"29 "gopkg.in/yaml.v2"
24 "launchpad.net/goget-ubuntu-touch/diskimage"30 "launchpad.net/goget-ubuntu-touch/diskimage"
25 "launchpad.net/goget-ubuntu-touch/sysutils"31 "launchpad.net/goget-ubuntu-touch/sysutils"
26 "launchpad.net/goget-ubuntu-touch/ubuntuimage"32 "launchpad.net/goget-ubuntu-touch/ubuntuimage"
27 "launchpad.net/snappy/helpers"
28 "launchpad.net/snappy/progress"
29 "launchpad.net/snappy/provisioning"
30 "launchpad.net/snappy/release"
31 "launchpad.net/snappy/snappy"
32)33)
3334
34type imageFlavor string35type imageFlavor string
@@ -159,14 +160,14 @@
159}160}
160161
161func (s *Snapper) install(systemPath string) error {162func (s *Snapper) install(systemPath string) error {
162 snappy.SetRootDir(systemPath)163 dirs.SetRootDir(systemPath)
163 defer snappy.SetRootDir("/")164 defer dirs.SetRootDir("/")
164165
165 flags := s.installFlags()166 flags := s.installFlags()
166 oemSoftware := s.oem.OEM.Software167 oemSoftware := s.oem.OEM.Software
167 packageCount := len(s.Development.Install) + len(oemSoftware.BuiltIn) + len(oemSoftware.Preinstalled)168 packageCount := len(s.Development.Install) + len(oemSoftware.BuiltIn) + len(oemSoftware.Preinstalled)
168 if s.Oem != "" {169 if s.Oem != "" {
169 packageCount += 1170 packageCount++
170 }171 }
171 packageQueue := make([]string, 0, packageCount)172 packageQueue := make([]string, 0, packageCount)
172173
@@ -206,8 +207,8 @@
206207
207 s.stagingRootPath = tempDir208 s.stagingRootPath = tempDir
208209
209 snappy.SetRootDir(tempDir)210 dirs.SetRootDir(tempDir)
210 defer snappy.SetRootDir("/")211 defer dirs.SetRootDir("/")
211 release.Override(release.Release{212 release.Override(release.Release{
212 Flavor: string(s.flavor),213 Flavor: string(s.flavor),
213 Series: s.Positional.Release,214 Series: s.Positional.Release,
214215
=== modified file 'ubuntu-emulator/snapshot.go'
--- ubuntu-emulator/snapshot.go 2014-10-09 12:18:37 +0000
+++ ubuntu-emulator/snapshot.go 2015-11-09 12:50:20 +0000
@@ -77,7 +77,7 @@
77 }77 }
78 }78 }
79 } else {79 } else {
80 errors.New("Command not implemented or supported")80 return errors.New("Command not implemented or supported")
81 }81 }
8282
83 return nil83 return nil

Subscribers

People subscribed via source and target branches