diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-11-17 11:21:39 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-11-17 11:21:39 +0100 |
| commit | 8295e1bc0b0e97af75f9e3b77fc7496c7ec1d176 (patch) | |
| tree | 5e2c480f2ce7d383a0bc4ad9ba4dcd43e6aa0cda | |
| parent | af4667b578c412c2030003127290ddc7f90e860d (diff) | |
| parent | 13998bda4883b835c81a0fdeec5ff8c7d0616d61 (diff) | |
Merge branch 'feature/reboot-simplify' into feature/snapfs-mount4feature/snapfs-mount4
| -rw-r--r-- | cmd/snappy/cmd_list.go | 6 | ||||
| -rw-r--r-- | po/snappy.pot | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/cmd/snappy/cmd_list.go b/cmd/snappy/cmd_list.go index c812a4eaae..08e13f6570 100644 --- a/cmd/snappy/cmd_list.go +++ b/cmd/snappy/cmd_list.go @@ -126,12 +126,6 @@ func showVerboseList(installed []snappy.Part, o io.Writer) { } func showRebootMessage(installed []snappy.Part, o io.Writer) { - // Initialise to handle systems without a provisioned "other" - otherVersion := "0" - currentVersion := "0" - otherName := "" - needsReboot := false - // display all parts that require a reboot for _, part := range installed { if !part.NeedsReboot() { diff --git a/po/snappy.pot b/po/snappy.pot index a700a0aea5..ae5a2e09ec 100644 --- a/po/snappy.pot +++ b/po/snappy.pot @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: snappy\n" "Report-Msgid-Bugs-To: snappy-devel@lists.ubuntu.com\n" - "POT-Creation-Date: 2015-11-17 09:58+0100\n" + "POT-Creation-Date: 2015-11-17 11:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |