Merge lp:~chipaca/snappy/trunk-to-15.04 into lp:snappy/15.04

[John Lenton]

All the latest trunk, freshly merged just for you.

[Leo Arias (elopio)]

Already reviewed and approved branches.

review: Approve

=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-09-01 10:00:49 +0000
+++ helpers/helpers.go	2015-09-23 16:22:16 +0000
@@ -115,6 +115,10 @@
 
 // UnpackTar unpacks the given tar file into the target directory
 func UnpackTar(r io.Reader, targetDir string, fn UnpackTarTransformFunc) error {
+	// ensure we we extract with the original permissions
+	oldUmask := syscall.Umask(0)
+	defer syscall.Umask(oldUmask)
+
 	return TarIterate(r, func(tr *tar.Reader, hdr *tar.Header) (err error) {
 		// run tar transform func
 		name := hdr.Name

=== modified file 'helpers/helpers_test.go'
--- helpers/helpers_test.go	2015-08-21 12:14:16 +0000
+++ helpers/helpers_test.go	2015-09-23 16:22:16 +0000
@@ -27,6 +27,7 @@
 	"os"
 	"os/exec"
 	"path/filepath"
+	"syscall"
 	"testing"
 
 	. "gopkg.in/check.v1"
@@ -483,3 +484,34 @@
 	err := CopyIfDifferent(src, dst)
 	c.Assert(err, NotNil)
 }
+
+func (ts *HTestSuite) TestUnpackPermissions(c *C) {
+	tarArchive := filepath.Join(c.MkDir(), "foo.tar")
+
+	canaryName := "foo"
+	canaryPerms := os.FileMode(0644)
+	tmpdir := c.MkDir()
+	err := ioutil.WriteFile(filepath.Join(tmpdir, canaryName), []byte(nil), canaryPerms)
+	c.Assert(err, IsNil)
+
+	ChDir(tmpdir, func() {
+		cmd := exec.Command("tar", "cvf", tarArchive, ".")
+		_, err = cmd.CombinedOutput()
+		c.Assert(err, IsNil)
+	})
+
+	// set crazy umask
+	oldUmask := syscall.Umask(0077)
+	defer syscall.Umask(oldUmask)
+
+	// unpack
+	unpackdir := c.MkDir()
+	f, err := os.Open(tarArchive)
+	c.Assert(err, IsNil)
+	defer f.Close()
+	UnpackTar(f, unpackdir, nil)
+
+	st, err := os.Stat(filepath.Join(unpackdir, canaryName))
+	c.Assert(err, IsNil)
+	c.Assert(st.Mode()&os.ModePerm, Equals, canaryPerms)
+}

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-09-14 23:19:11 +0000
+++ snappy/parts.go	2015-09-23 16:22:16 +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 16:22:16 +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)