Merge lp:~chipaca/snappy/no-inactive-service-ops into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Only run service commands on active parts.

[Michael Vogt (mvo)]

Thanks for fixing this issue!

review: Approve

=== modified file 'snappy/service.go'
--- snappy/service.go	2015-09-25 15:27:11 +0000
+++ snappy/service.go	2015-10-10 10:41:57 +0000
@@ -72,6 +72,10 @@
 
 	foundSnap := false
 	for _, part := range installed {
+		if !part.IsActive() {
+			continue
+		}
+
 		snap, ok := part.(*SnapPart)
 		if !ok {
 			// can't happen

=== modified file 'snappy/service_test.go'
--- snappy/service_test.go	2015-09-25 15:27:11 +0000
+++ snappy/service_test.go	2015-10-10 10:41:57 +0000
@@ -80,7 +80,23 @@
 	c.Assert(os.MkdirAll(filepath.Join(dirs.GlobalRootDir, "/etc/systemd/system/multi-user.target.wants"), 0755), IsNil)
 	systemd.SystemctlCmd = s.myRun
 	systemd.JournalctlCmd = s.myJctl
-	makeInstalledMockSnap(dirs.GlobalRootDir, "")
+	_, err := makeInstalledMockSnap(dirs.GlobalRootDir, `name: hello-app
+version: 1.09
+vendor: mvo@ubuntu
+services:
+ - name: svc1
+   start: bin/hello
+`)
+	c.Assert(err, IsNil)
+	f, err := makeInstalledMockSnap(dirs.GlobalRootDir, `name: hello-app
+version: 1.10
+vendor: mvo@ubuntu
+services:
+ - name: svc1
+   start: bin/hello
+`)
+	c.Assert(err, IsNil)
+	c.Assert(makeSnapActive(f), IsNil)
 	s.i = 0
 	s.argses = nil
 	s.errors = nil