Merge lp:~mvo/snappy/experimental-simplify-the-upgrader-script into lp:~mvo/snappy/si-progress

Proposed by Michael Vogt
Status: Superseded
Proposed branch: lp:~mvo/snappy/experimental-simplify-the-upgrader-script
Merge into: lp:~mvo/snappy/si-progress
Diff against target: 15 lines (+4/-1)
1 file modified
snappy/systemimage.go (+4/-1)
To merge this branch: bzr merge lp:~mvo/snappy/experimental-simplify-the-upgrader-script
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+247949@code.launchpad.net

This proposal has been superseded by a proposal from 2015-01-29.

Description of the change

This branch might be interessting to simplfy the way that ubuntu-core-upgrader
works. The idea is that the DownloadUpdate() call is run with the other
partition mounted RW (DownloadUpdate will also apply the update so its
probably a good idea to update the name to reflect this fact).

This should in turn make the ubuntu-core-upgrader much simpler and allow
us to remove all the mount/unmount logic in there as this is hanlded by
snappy already and it move the responsibility of all this into a single
component (partition.go). We still need to ensure that "sync_partition()"
is called of course in ubuntu-core-upgrader (that is done in _cmd_mount()
right now AFAICS).

To post a comment you must log in.
132. By Michael Vogt

merged lp:snappy and resolved conflicts

Unmerged revisions

132. By Michael Vogt

merged lp:snappy and resolved conflicts

131. By Michael Vogt

Run "DownloadUpdate()" with the other partition mounted RW. This should
allow us to simplify the ubuntu-core-upgrader script significantly by
removing all the mount/umount logic there (making _cmd_mount/_cmd_umount
no-ops). The only catch is that the empty-parititon detection needs to
be done still of course.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snappy/systemimage.go'
2--- snappy/systemimage.go 2015-01-28 09:59:04 +0000
3+++ snappy/systemimage.go 2015-01-29 09:10:54 +0000
4@@ -136,7 +136,10 @@
5 return err
6 }
7
8- err = s.proxy.DownloadUpdate()
9+ err = s.partition.RunWithOther(true, func(o string) (err error) {
10+ err = s.proxy.DownloadUpdate()
11+ return
12+ })
13 if err != nil {
14 return err
15 }

Subscribers

People subscribed via source and target branches

to all changes: