Merge lp:~sergiusens/snapweb/snappyUpdateDeps into lp:~snappy-dev/snapweb/trunk

Proposed by Sergio Schvezov on 2015-05-06
Status: Merged
Approved by: John Lenton on 2015-05-06
Approved revision: 119
Merged at revision: 119
Proposed branch: lp:~sergiusens/snapweb/snappyUpdateDeps
Merge into: lp:~snappy-dev/snapweb/trunk
Diff against target: 45 lines (+17/-2)
3 files modified
README.md (+15/-0)
dependencies.tsv (+1/-1)
webprogress/meter.go (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/snapweb/snappyUpdateDeps
Reviewer Review Type Date Requested Status
John Lenton 2015-05-06 Approve on 2015-05-06
Review via email: mp+258406@code.launchpad.net

Commit Message

Update to API changes, update dependencies add instructions on how to update them

To post a comment you must log in.
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2015-05-05 23:15:41 +0000
3+++ README.md 2015-05-06 15:55:36 +0000
4@@ -107,3 +107,18 @@
5 curl http://localhost:4200/api/v1/store/search?q=xkcd
6
7 curl http://localhost:4200/api/v1/store/package/com.ubuntu.snappy.xkcd-webserver
8+
9+### Dependencies handling
10+
11+To generate dependencies.tsv you need `godeps`, so
12+
13+ go get launchpad.net/godeps
14+
15+To obtain the correct dependencies for the project, run:
16+
17+ godeps -t -u dependencies.tsv
18+
19+If the dependencies need updating
20+
21+ godeps -t ./... > dependencies.tsv
22+
23
24=== modified file 'dependencies.tsv'
25--- dependencies.tsv 2015-05-05 23:56:14 +0000
26+++ dependencies.tsv 2015-05-06 15:55:36 +0000
27@@ -6,4 +6,4 @@
28 github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z
29 gopkg.in/check.v1 git 64131543e7896d5bcc6bd5a76287eb75ea96c673 2014-10-24T13:38:53Z
30 gopkg.in/yaml.v2 git 49c95bdc21843256fb6c4e0d370a05f24a0bf213 2015-02-24T22:57:58Z
31-launchpad.net/snappy bzr snappy_tarmac-20150505234155-4engr9ywa3p9badb 441
32+launchpad.net/snappy bzr snappy_tarmac-20150506140221-gy35a67lv7tmc0nl 442
33
34=== modified file 'webprogress/meter.go'
35--- webprogress/meter.go 2015-05-06 10:24:29 +0000
36+++ webprogress/meter.go 2015-05-06 15:55:36 +0000
37@@ -62,7 +62,7 @@
38 }
39
40 // Start starts showing progress
41-func (t *WebProgress) Start(total float64) {
42+func (t *WebProgress) Start(pkgName string, total float64) {
43 t.total = total
44 t.Status = StatusInstalling
45 }

Subscribers

People subscribed via source and target branches