diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2016-01-28 12:31:46 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2016-01-28 12:31:46 +0100 |
| commit | 8dac9f548f466b2337a9a942e98ac8fffc5fe12a (patch) | |
| tree | d78bc252608a9e1f1624922c3efa1425a63dda72 | |
| parent | 6587856d24dae10dc5f1cde13413c384c36e23ab (diff) | |
update overlord for snap.yamlfeature/snap-yaml3
| -rw-r--r-- | snappy/overlord.go | 2 | ||||
| -rw-r--r-- | snappy/overlord_test.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/snappy/overlord.go b/snappy/overlord.go index 1eee58413a..8734a94a8e 100644 --- a/snappy/overlord.go +++ b/snappy/overlord.go @@ -54,7 +54,7 @@ func (o *Overlord) SetActive(sp *SnapPart, active bool, meter progress.Meter) er // Installed returns the installed snaps from this repository func (o *Overlord) Installed() ([]*SnapPart, error) { - globExpr := filepath.Join(dirs.SnapSnapsDir, "*", "*", "meta", "package.yaml") + globExpr := filepath.Join(dirs.SnapSnapsDir, "*", "*", "meta", "snap.yaml") parts, err := o.partsForGlobExpr(globExpr) if err != nil { return nil, fmt.Errorf("Can not get the installed snaps: %s", err) diff --git a/snappy/overlord_test.go b/snappy/overlord_test.go index 85ba9f46f0..cefbc08c9f 100644 --- a/snappy/overlord_test.go +++ b/snappy/overlord_test.go @@ -39,7 +39,8 @@ version: 1.0 ` func (o *overlordTestSuite) TestInstalled(c *C) { - makeInstalledMockSnap(dirs.GlobalRootDir, helloAppYaml) + _, err := makeInstalledMockSnap(dirs.GlobalRootDir, helloAppYaml) + c.Assert(err, IsNil) overlord := &Overlord{} installed, err := overlord.Installed() |