Merge lp:~mterry/snappy/rollback-reboot into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Terry]

When rolling back. output version info, especially any messages about rebooting to pick up the new version.

When rolling back. output version info, especially any messages about rebooting to pick up the new version.

This makes "rollback" work just like "update" which makes the same output about parts it updates.

I didn't add a test. Seems like such cmd tests tend to go in the selftests branch.

[Sergio Schvezov (sergiusens)]

We have no spec for this, so I'll leave it up to you.
Setting ubuntu-core to version 59
Name Date Version Developer
ubuntu-core 2015-06-03 59 ubuntu!
Reboot to use the new ubuntu-core.

How about just using showRebootMessage?
(amd64)ubuntu@localhost:~$ sudo ./snappy rollback ubuntu-core
Setting ubuntu-core to version 59
Reboot to use the new ubuntu-core.

Just to avoid the double display of version, the other option would be to remove the print for
"Setting ubuntu-core to version 59" to keep output consistency with the other commands

(amd64)ubuntu@localhost:~$ sudo ./snappy rollback ubuntu-core
Name Date Version Developer
ubuntu-core 2015-06-03 59 ubuntu!
Reboot to use the new ubuntu-core.

review: Needs Information

[Michael Terry (mterry)]

I hear ya. But I was trying to make it feel very similar to "update" which has the same redundant output:

===
Installing ubuntu-core (60)
Starting download of ubuntu-core
30.51 MB / 30.51 MB [====================================] 100.00 % 485.97 KB/s
Done
Name Date Version Developer
ubuntu-core 2015-06-04 60 ubuntu!
Reboot to use the new ubuntu-core.
===

But if you still prefer, I'm happy to remove the "Setting ubuntu-core to version 59" bit.

[Sergio Schvezov (sergiusens)]

> But if you still prefer, I'm happy to remove the "Setting ubuntu-core to
> version 59" bit.

Well at least we are on the same page, I guess we want the first print since on armhf the time between some feedback and this will not be instant.

We probably need a spinner here instead.

review: Approve

[lp:~mterry/snappy/rollback-reboot]

486. By Michael Terry on 2015-06-04

Move notice about rolling back up a bit

487. By Michael Terry on 2015-06-04

Move print back, version isn't available yet

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'cmd/snappy/cmd_rollback.go'
--- cmd/snappy/cmd_rollback.go	2015-05-19 14:09:19 +0000
+++ cmd/snappy/cmd_rollback.go	2015-06-04 19:02:18 +0000
@@ -21,6 +21,7 @@
 
 import (
 	"fmt"
+	"os"
 
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/priv"
@@ -69,5 +70,14 @@
 	}
 	fmt.Printf("Setting %s to version %s\n", pkg, nowVersion)
 
+	m := snappy.NewMetaRepository()
+	installed, err := m.Installed()
+	if err != nil {
+		return err
+	}
+
+	parts := snappy.FindSnapsByNameAndVersion(pkg, nowVersion, installed)
+	showVerboseList(parts, os.Stdout)
+
 	return nil
 }