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
139
		return nil, errors.New("img not mounted")
139
		return nil, errors.New("img not mounted")
6
140
	}
140
	}
7
141
141
12
142
	return []string{
142
	paths := []string{filepath.Join(img.Mountpoint, string(systemDataDir))}
13
143
		filepath.Join(img.Mountpoint, string(systemDataDir)),
143
14
144
		filepath.Join(img.Mountpoint, string(systemDataDir2)),
144
	if len(img.parts) == 3 {
15
145
	}, nil
145
		paths = append(paths, img.Mountpoint, string(systemDataDir2))
16
146
	}
17
147
18
148
	return paths, nil
19
146
}
149
}
20
147
150
21
148
//Mount the DiskImage
151
//Mount the DiskImage
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
Related bugs:	Link a bug report
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
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	139	return nil, errors.New("img not mounted")	139	return nil, errors.New("img not mounted")
6	140	}	140	}
7	141		141
12	142	return []string{	142	paths := []string{filepath.Join(img.Mountpoint, string(systemDataDir))}
13	143	filepath.Join(img.Mountpoint, string(systemDataDir)),	143
14	144	filepath.Join(img.Mountpoint, string(systemDataDir2)),	144	if len(img.parts) == 3 {
15	145	}, nil	145	paths = append(paths, img.Mountpoint, string(systemDataDir2))
16			146	}
17			147
18			148	return paths, nil
19	146	}	149	}
20	147		150
21	148	//Mount the DiskImage	151	//Mount the DiskImage