Merge lp:~sergiusens/goget-ubuntu-touch/dual_wielding into lp:goget-ubuntu-touch

Proposed by Sergio Schvezov on 2014-11-26
Status: Superseded
Proposed branch: lp:~sergiusens/goget-ubuntu-touch/dual_wielding
Merge into: lp:goget-ubuntu-touch
Diff against target: 21 lines (+7/-4)
1 file modified
diskimage/image.go (+7/-4)
To merge this branch: bzr merge lp:~sergiusens/goget-ubuntu-touch/dual_wielding
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-11-26
Ubuntu Phablet Team 2014-11-26 Pending
Review via email: mp+242955@code.launchpad.net

Commit message

ubuntu-device-flash: return the correct amount of system image parts

Unmerged revisions

100. By Sergio Schvezov on 2014-11-26

ubuntu-device-flash: return the correct amount of system image parts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'diskimage/image.go'
2--- diskimage/image.go 2014-11-25 19:31:44 +0000
3+++ diskimage/image.go 2014-11-26 18:21:18 +0000
4@@ -139,10 +139,13 @@
5 return nil, errors.New("img not mounted")
6 }
7
8- return []string{
9- filepath.Join(img.Mountpoint, string(systemDataDir)),
10- filepath.Join(img.Mountpoint, string(systemDataDir2)),
11- }, nil
12+ paths := []string{filepath.Join(img.Mountpoint, string(systemDataDir))}
13+
14+ if len(img.parts) == 3 {
15+ paths = append(paths, img.Mountpoint, string(systemDataDir2))
16+ }
17+
18+ return paths, nil
19 }
20
21 //Mount the DiskImage

Subscribers

People subscribed via source and target branches