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

[Sergio Schvezov]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-armhf-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/102/rebuild

review: Approve (continuous-integration)

Unmerged revisions

100. By Sergio Schvezov on 2014-11-26

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

=== modified file 'diskimage/image.go'
--- diskimage/image.go	2014-11-25 19:31:44 +0000
+++ diskimage/image.go	2014-11-26 18:21:18 +0000
@@ -139,10 +139,13 @@
 		return nil, errors.New("img not mounted")
 	}
 
-	return []string{
-		filepath.Join(img.Mountpoint, string(systemDataDir)),
-		filepath.Join(img.Mountpoint, string(systemDataDir2)),
-	}, nil
+	paths := []string{filepath.Join(img.Mountpoint, string(systemDataDir))}
+
+	if len(img.parts) == 3 {
+		paths = append(paths, img.Mountpoint, string(systemDataDir2))
+	}
+
+	return paths, nil
 }
 
 //Mount the DiskImage