21 files changed, 128 insertions, 81 deletions

diff --git a/cmd/snappy/cmd_booted.go b/cmd/snappy/cmd_booted.go
index 8af32b86fa..d61f5354d4 100644
--- a/cmd/snappy/cmd_booted.go
+++ b/cmd/snappy/cmd_booted.go
@@ -27,11 +27,13 @@ type cmdBooted struct {
 }
 
 func init() {
-	var cmdBootedData cmdBooted
-	parser.AddCommand("booted",
-	"Flag that rootfs booted successfully",
-	"Not necessary to run this command manually",
-	&cmdBootedData)
+	_, err := parser.AddCommand("booted",
+	"internal",
+	"internal",
+	&cmdBooted{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdBooted) Execute(args []string) (err error) {
diff --git a/cmd/snappy/cmd_build.go b/cmd/snappy/cmd_build.go
index 3d4f1f1848..0d06b0f73d 100644
--- a/cmd/snappy/cmd_build.go
+++ b/cmd/snappy/cmd_build.go
@@ -20,6 +20,7 @@ package main
 import (
	"fmt"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/snappy"
 )
 
@@ -32,11 +33,13 @@ type cmdBuild struct {
 const longBuildHelp = `Creates a snap package and if available, runs the review scripts.`
 
 func init() {
-	var cmdBuildData cmdBuild
-	cmd, _ := parser.AddCommand("build",
+	cmd, err := parser.AddCommand("build",
	"Builds a snap package",
	longBuildHelp,
-	&cmdBuildData)
+	&cmdBuild{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 
	cmd.Aliases = append(cmd.Aliases, "bu")
 }
diff --git a/cmd/snappy/cmd_config.go b/cmd/snappy/cmd_config.go
index 3e92fa7951..9e646ece7d 100644
--- a/cmd/snappy/cmd_config.go
+++ b/cmd/snappy/cmd_config.go
@@ -36,17 +36,14 @@ type cmdConfig struct {
 
 const shortConfigHelp = `Set configuration for an installed package.`
 
-const longConfigHelp = `Configures a package. The configuration is a
-YAML file, provided in the specified file which can be “-” for
-stdin. Output of the command is the current configuration, so running
-this command with no input file provides a snapshot of the app’s
-current config. `
+const longConfigHelp = `Configures a package. The configuration is a YAML file, provided in the specified file which can be "-" for stdin. Output of the command is the current configuration, so running this command with no input file provides a snapshot of the app's current config. `
 
 func init() {
-	var cmdConfigData cmdConfig
-	if _, err := parser.AddCommand("config", shortConfigHelp, longConfigHelp, &cmdConfigData); err != nil {
-	// panic here as something must be terribly wrong if there is an
-	// error here
+	_, err := parser.AddCommand("config",
+	shortConfigHelp,
+	longConfigHelp,
+	&cmdConfig{})
+	if err != nil {
	logger.LogAndPanic(err)
	}
 }
diff --git a/cmd/snappy/cmd_first_boot.go b/cmd/snappy/cmd_first_boot.go
index 4b1ee2a23d..f61cacb52e 100644
--- a/cmd/snappy/cmd_first_boot.go
+++ b/cmd/snappy/cmd_first_boot.go
@@ -20,20 +20,22 @@ package main
 import (
	"fmt"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/snappy"
 )
 
+type cmdInternalFirstBootOemConfig struct{}
+
 func init() {
-	var cmdInternalFirstBootOemConfig cmdInternalFirstBootOemConfig
-	if _, err := parser.AddCommand("firstboot", "internal", "internal", &cmdInternalFirstBootOemConfig); err != nil {
-	// panic here as something must be terribly wrong if there is an
-	// error here
-	panic(err)
+	_, err := parser.AddCommand("firstboot",
+	"internal",
+	"internal",
+	&cmdInternalFirstBootOemConfig{})
+	if err != nil {
+	logger.LogAndPanic(err)
	}
 }
 
-type cmdInternalFirstBootOemConfig struct{}
-
 func (x *cmdInternalFirstBootOemConfig) Execute(args []string) error {
	err := snappy.OemConfig()
	if err == snappy.ErrNotFirstBoot {
diff --git a/cmd/snappy/cmd_hwassign.go b/cmd/snappy/cmd_hwassign.go
index 12c33eb8d7..4c4718fc4d 100644
--- a/cmd/snappy/cmd_hwassign.go
+++ b/cmd/snappy/cmd_hwassign.go
@@ -20,6 +20,7 @@ package main
 import (
	"fmt"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/snappy"
 )
@@ -36,11 +37,13 @@ const shortHWAssignHelp = `Assign a hardware device to a package`
 const longHWAssignHelp = `This command adds access to a specific hardware device (e.g. /dev/ttyUSB0) for an installed package.`
 
 func init() {
-	var cmdHWAssignData cmdHWAssign
-	_, _ = parser.AddCommand("hw-assign",
+	_, err := parser.AddCommand("hw-assign",
	shortHWAssignHelp,
	longHWAssignHelp,
-	&cmdHWAssignData)
+	&cmdHWAssign{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdHWAssign) Execute(args []string) (err error) {
diff --git a/cmd/snappy/cmd_hwinfo.go b/cmd/snappy/cmd_hwinfo.go
index 6a507788f9..a953966c33 100644
--- a/cmd/snappy/cmd_hwinfo.go
+++ b/cmd/snappy/cmd_hwinfo.go
@@ -21,6 +21,7 @@ import (
	"fmt"
	"strings"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/snappy"
 )
@@ -36,11 +37,13 @@ const shortHWInfoHelp = `List assigned hardware device for a package`
 const longHWInfoHelp = `This command list what hardware an installed package can access`
 
 func init() {
-	var cmdHWInfoData cmdHWInfo
-	_, _ = parser.AddCommand("hw-info",
+	_, err := parser.AddCommand("hw-info",
	shortHWInfoHelp,
	longHWInfoHelp,
-	&cmdHWInfoData)
+	&cmdHWInfo{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func outputHWAccessForPkgname(pkgname string, writePaths []string) {
diff --git a/cmd/snappy/cmd_hwunassign.go b/cmd/snappy/cmd_hwunassign.go
index 0336a81065..6f29dbcbdd 100644
--- a/cmd/snappy/cmd_hwunassign.go
+++ b/cmd/snappy/cmd_hwunassign.go
@@ -20,6 +20,7 @@ package main
 import (
	"fmt"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/snappy"
 )
@@ -36,11 +37,13 @@ const shortHWUnassignHelp = `Unassign a hardware device to a package`
 const longHWUnassignHelp = `This command removes access of a specific hardware device (e.g. /dev/ttyUSB0) for an installed package.`
 
 func init() {
-	var cmdHWUnassignData cmdHWUnassign
-	_, _ = parser.AddCommand("hw-unassign",
+	_, err := parser.AddCommand("hw-unassign",
	shortHWUnassignHelp,
	longHWUnassignHelp,
-	&cmdHWUnassignData)
+	&cmdHWUnassign{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdHWUnassign) Execute(args []string) (err error) {
diff --git a/cmd/snappy/cmd_info.go b/cmd/snappy/cmd_info.go
index 69549dcf0b..7b3f49afa1 100644
--- a/cmd/snappy/cmd_info.go
+++ b/cmd/snappy/cmd_info.go
@@ -43,10 +43,11 @@ Providing a package name will display information about a specific installed pac
 The verbose version of the info command for a package will also tell you the available channels for that package, when it was installed for the first time, disk space utilization, and in the case of frameworks, which apps are able to use the framework.`
 
 func init() {
-	var cmdInfoData cmdInfo
-	if _, err := parser.AddCommand("info", shortInfoHelp, longInfoHelp, &cmdInfoData); err != nil {
-	// panic here as something must be terribly wrong if there is an
-	// error here
+	_, err := parser.AddCommand("info",
+	shortInfoHelp,
+	longInfoHelp,
+	&cmdInfo{})
+	if err != nil {
	logger.LogAndPanic(err)
	}
 }
diff --git a/cmd/snappy/cmd_install.go b/cmd/snappy/cmd_install.go
index 8a1b4a1309..71fbe5bf18 100644
--- a/cmd/snappy/cmd_install.go
+++ b/cmd/snappy/cmd_install.go
@@ -22,6 +22,7 @@ import (
	"fmt"
	"os"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/progress"
	"launchpad.net/snappy/snappy"
@@ -37,11 +38,13 @@ type cmdInstall struct {
 }
 
 func init() {
-	var cmdInstallData cmdInstall
-	_, _ = parser.AddCommand("install",
+	_, err := parser.AddCommand("install",
	"Install a snap package",
	"Install a snap package",
-	&cmdInstallData)
+	&cmdInstall{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdInstall) Execute(args []string) (err error) {
diff --git a/cmd/snappy/cmd_internal_run_hooks.go b/cmd/snappy/cmd_internal_run_hooks.go
index 30e59f1779..05fd396550 100644
--- a/cmd/snappy/cmd_internal_run_hooks.go
+++ b/cmd/snappy/cmd_internal_run_hooks.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/snappy"
 )
 
@@ -8,11 +9,12 @@ type cmdInternalRunHooks struct {
 }
 
 func init() {
-	var cmdInternalRunHooks cmdInternalRunHooks
-	if _, err := parser.AddCommand("internal-run-hooks", "internal", "internal", &cmdInternalRunHooks); err != nil {
-	// panic here as something must be terribly wrong if there is an
-	// error here
-	panic(err)
+	_, err := parser.AddCommand("internal-run-hooks",
+	"internal",
+	"internal",
+	&cmdInternalRunHooks{})
+	if err != nil {
+	logger.LogAndPanic(err)
	}
 }
 
diff --git a/cmd/snappy/cmd_internal_unpack.go b/cmd/snappy/cmd_internal_unpack.go
index 1696dea37a..9fdedf4c86 100644
--- a/cmd/snappy/cmd_internal_unpack.go
+++ b/cmd/snappy/cmd_internal_unpack.go
@@ -29,6 +29,7 @@ import (
 
	"launchpad.net/snappy/clickdeb"
	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/logger"
 )
 
 // #include <sys/prctl.h>
@@ -145,11 +146,12 @@ func unpackAndDropPrivs(snapFile, targetDir, rootDir string) error {
 }
 
 func init() {
-	var cmdInternalUnpackData cmdInternalUnpack
-	if _, err := parser.AddCommand("internal-unpack", "internal", "internal", &cmdInternalUnpackData); err != nil {
-	// panic here as something must be terribly wrong if there is an
-	// error here
-	panic(err)
+	_, err := parser.AddCommand("internal-unpack",
+	"internal",
+	"internal",
+	&cmdInternalUnpack{})
+	if err != nil {
+	logger.LogAndPanic(err)
	}
 }
 
diff --git a/cmd/snappy/cmd_list.go b/cmd/snappy/cmd_list.go
index 93a1abb92b..838285cbc3 100644
--- a/cmd/snappy/cmd_list.go
+++ b/cmd/snappy/cmd_list.go
@@ -35,7 +35,7 @@ type cmdList struct {
 
 const shortListHelp = `List active components installed on a snappy system`
 
-const longListHelp = `Provides a list of all active components installed on a snappy system
+const longListHelp = `Provides a list of all active components installed on a snappy system.
 
 If requested, the command will find out if there are updates for any of the components and indicate that by appending a * to the date. This will be slower as it requires a round trip to the app store on the network.
 
@@ -44,11 +44,11 @@ The developer information refers to non-mainline versions of a package (much lik
 When a verbose listing is requested, information about the channel used is displayed; which is one of alpha, beta, rc or stable, and all fields are fully expanded too. In some cases, older (inactive) versions of snappy packages will be installed, these will be shown in the verbose output and the active version indicated with a * appended to the name of the component.`
 
 func init() {
-	var cmdListData cmdList
-	cmd, err := parser.AddCommand("list", shortListHelp, longListHelp, &cmdListData)
+	cmd, err := parser.AddCommand("list",
+	shortListHelp,
+	longListHelp,
+	&cmdList{})
	if err != nil {
-	// panic here as something must be terribly wrong if there is an
-	// error here
	logger.LogAndPanic(err)
	}
 
diff --git a/cmd/snappy/cmd_login.go b/cmd/snappy/cmd_login.go
index a2aee04984..4ab0e7a760 100644
--- a/cmd/snappy/cmd_login.go
+++ b/cmd/snappy/cmd_login.go
@@ -24,6 +24,7 @@ import (
 
	"code.google.com/p/go.crypto/ssh/terminal"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/snappy"
 )
 
@@ -38,11 +39,13 @@ const shortLoginHelp = `Log into the store`
 const longLoginHelp = `This command logs the given username into the store`
 
 func init() {
-	var cmdLoginData cmdLogin
-	_, _ = parser.AddCommand("login",
+	_, err := parser.AddCommand("login",
	shortLoginHelp,
	longLoginHelp,
-	&cmdLoginData)
+	&cmdLogin{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func requestStoreTokenWith2faRetry(username, password, tokenName string) (*snappy.StoreToken, error) {
diff --git a/cmd/snappy/cmd_purge.go b/cmd/snappy/cmd_purge.go
index 64738433bc..78ef9e752e 100644
--- a/cmd/snappy/cmd_purge.go
+++ b/cmd/snappy/cmd_purge.go
@@ -20,6 +20,7 @@ package main
 import (
	"fmt"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/progress"
	"launchpad.net/snappy/snappy"
@@ -35,9 +36,12 @@ const (
 )
 
 func init() {
-	_, err := parser.AddCommand("purge", shortPurgeHelp, longPurgeHelp, &cmdPurge{})
+	_, err := parser.AddCommand("purge",
+	shortPurgeHelp,
+	longPurgeHelp,
+	&cmdPurge{})
	if err != nil {
-	panic(err)
+	logger.LogAndPanic(err)
	}
 }
 
diff --git a/cmd/snappy/cmd_remove.go b/cmd/snappy/cmd_remove.go
index 58f82e992f..d57a3cd363 100644
--- a/cmd/snappy/cmd_remove.go
+++ b/cmd/snappy/cmd_remove.go
@@ -20,6 +20,7 @@ package main
 import (
	"fmt"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/progress"
	"launchpad.net/snappy/snappy"
@@ -30,11 +31,13 @@ type cmdRemove struct {
 }
 
 func init() {
-	var cmdRemoveData cmdRemove
-	_, _ = parser.AddCommand("remove",
+	_, err := parser.AddCommand("remove",
	"Remove a snapp part",
	"Remove a snapp part",
-	&cmdRemoveData)
+	&cmdRemove{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdRemove) Execute(args []string) (err error) {
diff --git a/cmd/snappy/cmd_rollback.go b/cmd/snappy/cmd_rollback.go
index f5e0018552..510ccdb294 100644
--- a/cmd/snappy/cmd_rollback.go
+++ b/cmd/snappy/cmd_rollback.go
@@ -20,6 +20,7 @@ package main
 import (
	"fmt"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/progress"
	"launchpad.net/snappy/snappy"
@@ -38,11 +39,13 @@ const longRollbackHelp = `Allows rollback of a snap to a previous installed vers
 `
 
 func init() {
-	var cmdRollbackData cmdRollback
-	_, _ = parser.AddCommand("rollback",
+	_, err := parser.AddCommand("rollback",
	shortRollbackHelp,
	longRollbackHelp,
-	&cmdRollbackData)
+	&cmdRollback{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdRollback) Execute(args []string) (err error) {
diff --git a/cmd/snappy/cmd_search.go b/cmd/snappy/cmd_search.go
index d464627da7..628622bf6c 100644
--- a/cmd/snappy/cmd_search.go
+++ b/cmd/snappy/cmd_search.go
@@ -22,6 +22,7 @@ import (
	"os"
	"text/tabwriter"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/snappy"
 )
 
@@ -30,11 +31,13 @@ type cmdSearch struct {
 }
 
 func init() {
-	var cmdSearchData cmdSearch
-	cmd, _ := parser.AddCommand("search",
+	cmd, err := parser.AddCommand("search",
	"Search for packages to install",
	"Query the store for available packages",
-	&cmdSearchData)
+	&cmdSearch{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 
	cmd.Aliases = append(cmd.Aliases, "se")
 }
diff --git a/cmd/snappy/cmd_set.go b/cmd/snappy/cmd_set.go
index 98b356c105..481f451dbe 100644
--- a/cmd/snappy/cmd_set.go
+++ b/cmd/snappy/cmd_set.go
@@ -21,6 +21,7 @@ import (
	"fmt"
	"strings"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/progress"
	"launchpad.net/snappy/snappy"
 )
@@ -38,11 +39,13 @@ Example:
 `
 
 func init() {
-	var cmdSetData cmdSet
-	_, _ = parser.AddCommand("set",
+	_, err := parser.AddCommand("set",
	"Set properties of system or package",
	setHelp,
-	&cmdSetData)
+	&cmdSet{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdSet) Execute(args []string) (err error) {
diff --git a/cmd/snappy/cmd_update.go b/cmd/snappy/cmd_update.go
index 4539bc8614..4d6c75d92b 100644
--- a/cmd/snappy/cmd_update.go
+++ b/cmd/snappy/cmd_update.go
@@ -23,6 +23,7 @@ import (
	"os/exec"
	"strings"
 
+	"launchpad.net/snappy/logger"
	"launchpad.net/snappy/priv"
	"launchpad.net/snappy/progress"
	"launchpad.net/snappy/snappy"
@@ -34,11 +35,13 @@ type cmdUpdate struct {
 }
 
 func init() {
-	var cmdUpdateData cmdUpdate
-	_, _ = parser.AddCommand("update",
+	_, err := parser.AddCommand("update",
	"Update all installed parts",
	"Ensures system is running with latest parts",
-	&cmdUpdateData)
+	&cmdUpdate{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 const (
diff --git a/cmd/snappy/cmd_versions.go b/cmd/snappy/cmd_versions.go
index 009b9bf661..20db6e7503 100644
--- a/cmd/snappy/cmd_versions.go
+++ b/cmd/snappy/cmd_versions.go
@@ -19,6 +19,8 @@ package main
 
 import (
	"fmt"
+
+	"launchpad.net/snappy/logger"
 )
 
 type cmdVersions struct {
@@ -29,11 +31,13 @@ const shortVersionsHelp = `(deprecated) please use "list"`
 const longVersionsHelp = `This command is no longer available, please use the "list" command`
 
 func init() {
-	var cmdVersionsData cmdVersions
-	_, _ = parser.AddCommand("versions",
+	_, err := parser.AddCommand("versions",
	shortVersionsHelp,
	longVersionsHelp,
-	&cmdVersionsData)
+	&cmdVersions{})
+	if err != nil {
+	logger.LogAndPanic(err)
+	}
 }
 
 func (x *cmdVersions) Execute(args []string) error {
diff --git a/helpers/helpers.go b/helpers/helpers.go
index 738fab6919..a7875d4d3c 100644
--- a/helpers/helpers.go
+++ b/helpers/helpers.go
@@ -346,9 +346,9 @@ func MajorMinor(info os.FileInfo) (uint32, uint32, error) {
	unixStat, ok := info.Sys().(*syscall.Stat_t)
	if ok {
	// see glibc: sysdeps/unix/sysv/linux/makedev.c
-	dev := uint32(unixStat.Rdev)
-	major := ((dev >> 8) & 0xfff) | ((dev >> 32) & ^uint32(0xfff))
-	minor := (dev & 0xff) | ((dev >> 12) & ^uint32(0xff))
+	dev := unixStat.Rdev
+	major := uint32((dev>>8)&0xfff) | (uint32(dev>>32) & ^uint32(0xfff))
+	minor := uint32(dev&0xff) | (uint32(dev>>12) & ^uint32(0xff))
 
	return major, minor, nil
	}