Snappy

Merge lp:~chipaca/snappy/always-take-version-from-filesystem into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. always-take-version-from-filesystem
  2. Merge into snappy-moved-to-github
Proposed by John Lenton on 2015-09-14
Status: Merged
Approved by: Michael Vogt on 2015-09-14
Approved revision: 683
Merged at revision: 683
Proposed branch: lp:~chipaca/snappy/always-take-version-from-filesystem
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 17 lines (+4/-3)
1 file modified
snappy/snapp.go (+4/-3)
To merge this branch: bzr merge lp:~chipaca/snappy/always-take-version-from-filesystem
Reviewer Review Type Date Requested Status
Michael Vogt 2015-09-14 Approve on 2015-09-14
Review via email: mp+270988@code.launchpad.net

Commit Message

Always take version from filesystem when loading a snap from there.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Heh, clever!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snappy/snapp.go'
2--- snappy/snapp.go 2015-09-14 12:33:36 +0000
3+++ snappy/snapp.go 2015-09-14 16:17:53 +0000
4@@ -606,9 +606,10 @@
5 m: m,
6 }
7
8- if origin == sideloadedOrigin {
9- m.Version = filepath.Base(part.basedir)
10- }
11+ // override the package's idea of its version
12+ // because that could have been rewritten on sideload
13+ // and origin is empty for frameworks, even sideloaded ones.
14+ m.Version = filepath.Base(part.basedir)
15
16 // check if the part is active
17 allVersionsDir := filepath.Dir(part.basedir)

Subscribers

People subscribed via source and target branches