Merge lp:~chipaca/snappy/update-qualified-name into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Make the updates call use the qualified name.

[Michael Vogt (mvo)]

Thanks!

review: Approve

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-09-14 23:19:11 +0000
+++ snappy/parts.go	2015-09-23 11:54:14 +0000
@@ -249,13 +249,15 @@
 // ActiveSnapNamesByType returns all installed snap names with the given type
 var ActiveSnapNamesByType = activeSnapNamesByTypeImpl
 
-func activeSnapNamesByTypeImpl(snapTs ...pkg.Type) (res []string, err error) {
+func activeSnapNamesByTypeImpl(snapTs ...pkg.Type) ([]string, error) {
 	installed, err := ActiveSnapsByType(snapTs...)
-	for _, part := range installed {
-		res = append(res, part.Name())
+	res := make([]string, len(installed))
+
+	for i, part := range installed {
+		res[i] = QualifiedName(part)
 	}
 
-	return res, nil
+	return res, err
 }
 
 // ActiveSnapByName returns all active snaps with the given name

=== modified file 'snappy/parts_test.go'
--- snappy/parts_test.go	2015-09-14 23:19:11 +0000
+++ snappy/parts_test.go	2015-09-23 11:54:14 +0000
@@ -57,6 +57,29 @@
 	c.Assert(parts[0].Name(), Equals, "framework1")
 }
 
+func (s *SnapTestSuite) TestActiveSnapNamesByType(c *C) {
+	yamlPath, err := makeInstalledMockSnap(s.tempdir, `name: app
+version: 1.10
+vendor: example.com`)
+	c.Assert(err, IsNil)
+	makeSnapActive(yamlPath)
+
+	yamlPath, err = makeInstalledMockSnap(s.tempdir, `name: fwk
+version: 1.0
+type: framework
+vendor: example.com`)
+	c.Assert(err, IsNil)
+	makeSnapActive(yamlPath)
+
+	names, err := ActiveSnapNamesByType(pkg.TypeApp)
+	c.Check(err, IsNil)
+	c.Check(names, DeepEquals, []string{"app." + testOrigin})
+
+	names, err = ActiveSnapNamesByType(pkg.TypeFramework)
+	c.Check(err, IsNil)
+	c.Check(names, DeepEquals, []string{"fwk"})
+}
+
 func (s *SnapTestSuite) TestMetaRepositoryDetails(c *C) {
 	_, err := makeInstalledMockSnap(s.tempdir, "")
 	c.Assert(err, IsNil)