Merge lp:~chipaca/snappy/no-more-log into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Remove usage of stdlib "log" in favour of our logger module.

[lp:~chipaca/snappy/no-more-log]

455. By John Lenton on 2015-05-08

oops, forgot an import

[Sergio Schvezov (sergiusens)]

I am down for this, I may be a bit reluctant to manually type WARNING and ERROR, but hey, it's just me ;-)

[John Lenton (chipaca)]

You're the one that said you wouldn't use the additional levels :-) but it'd be easy to add them.

[lp:~chipaca/snappy/no-more-log]

456. By John Lenton on 2015-05-08

Merged different-logger into no-more-log.

457. By John Lenton on 2015-05-11

Merged different-logger into no-more-log.

458. By John Lenton on 2015-05-11

make vet and lint happy

[Sergio Schvezov (sergiusens)]

> You're the one that said you wouldn't use the additional levels :-) but it'd
> be easy to add them.

I wouldn't use the levels, that's true, but I also wouldn't want to type in WARNING and ERROR :P

[lp:~chipaca/snappy/no-more-log]

459. By John Lenton on 2015-05-18

nuked various Warnings and WARNINGS from notices, made yaml errors better, nuked Error notice on yaml error

460. By John Lenton on 2015-05-18

merged trunk

[Sergio Schvezov (sergiusens)]

can you make lines beginning with "failed", and similar occurrences, start with an uppercase char ("Failed")?

[lp:~chipaca/snappy/no-more-log]

461. By John Lenton on 2015-05-18

more error message homogeneization

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'cmd/snappy/cmd_booted.go'
--- cmd/snappy/cmd_booted.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_booted.go	2015-05-18 19:06:00 +0000
@@ -32,7 +32,7 @@
 		"internal",
 		&cmdBooted{})
 	if err != nil {
-		logger.Panicf("unable to booted: %v", err)
+		logger.Panicf("Unable to booted: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_build.go'
--- cmd/snappy/cmd_build.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_build.go	2015-05-18 19:06:00 +0000
@@ -38,7 +38,7 @@
 		longBuildHelp,
 		&cmdBuild{})
 	if err != nil {
-		logger.Panicf("unable to build: %v", err)
+		logger.Panicf("Unable to build: %v", err)
 	}
 
 	cmd.Aliases = append(cmd.Aliases, "bu")

=== modified file 'cmd/snappy/cmd_config.go'
--- cmd/snappy/cmd_config.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_config.go	2015-05-18 19:06:00 +0000
@@ -44,7 +44,7 @@
 		longConfigHelp,
 		&cmdConfig{})
 	if err != nil {
-		logger.Panicf("unable to config: %v", err)
+		logger.Panicf("Unable to config: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_first_boot.go'
--- cmd/snappy/cmd_first_boot.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_first_boot.go	2015-05-18 19:06:00 +0000
@@ -32,7 +32,7 @@
 		"internal",
 		&cmdInternalFirstBootOemConfig{})
 	if err != nil {
-		logger.Panicf("unable to first_boot: %v", err)
+		logger.Panicf("Unable to first_boot: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_hwassign.go'
--- cmd/snappy/cmd_hwassign.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_hwassign.go	2015-05-18 19:06:00 +0000
@@ -42,7 +42,7 @@
 		longHWAssignHelp,
 		&cmdHWAssign{})
 	if err != nil {
-		logger.Panicf("unable to hwassign: %v", err)
+		logger.Panicf("Unable to hwassign: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_hwinfo.go'
--- cmd/snappy/cmd_hwinfo.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_hwinfo.go	2015-05-18 19:06:00 +0000
@@ -42,7 +42,7 @@
 		longHWInfoHelp,
 		&cmdHWInfo{})
 	if err != nil {
-		logger.Panicf("unable to hwinfo: %v", err)
+		logger.Panicf("Unable to hwinfo: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_hwunassign.go'
--- cmd/snappy/cmd_hwunassign.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_hwunassign.go	2015-05-18 19:06:00 +0000
@@ -42,7 +42,7 @@
 		longHWUnassignHelp,
 		&cmdHWUnassign{})
 	if err != nil {
-		logger.Panicf("unable to hwunassign: %v", err)
+		logger.Panicf("Unable to hwunassign: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_info.go'
--- cmd/snappy/cmd_info.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_info.go	2015-05-18 19:06:00 +0000
@@ -48,7 +48,7 @@
 		longInfoHelp,
 		&cmdInfo{})
 	if err != nil {
-		logger.Panicf("unable to info: %v", err)
+		logger.Panicf("Unable to info: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_install.go'
--- cmd/snappy/cmd_install.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_install.go	2015-05-18 19:06:00 +0000
@@ -43,7 +43,7 @@
 		"Install a snap package",
 		&cmdInstall{})
 	if err != nil {
-		logger.Panicf("unable to install: %v", err)
+		logger.Panicf("Unable to install: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_internal_run_hooks.go'
--- cmd/snappy/cmd_internal_run_hooks.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_internal_run_hooks.go	2015-05-18 19:06:00 +0000
@@ -14,7 +14,7 @@
 		"internal",
 		&cmdInternalRunHooks{})
 	if err != nil {
-		logger.Panicf("unable to internal_run_hooks: %v", err)
+		logger.Panicf("Unable to internal_run_hooks: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_internal_unpack.go'
--- cmd/snappy/cmd_internal_unpack.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_internal_unpack.go	2015-05-18 19:06:00 +0000
@@ -151,7 +151,7 @@
 		"internal",
 		&cmdInternalUnpack{})
 	if err != nil {
-		logger.Panicf("unable to internal_unpack: %v", err)
+		logger.Panicf("Unable to internal_unpack: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_list.go'
--- cmd/snappy/cmd_list.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_list.go	2015-05-18 19:06:00 +0000
@@ -49,7 +49,7 @@
 		longListHelp,
 		&cmdList{})
 	if err != nil {
-		logger.Panicf("unable to list: %v", err)
+		logger.Panicf("Unable to list: %v", err)
 	}
 
 	cmd.Aliases = append(cmd.Aliases, "li")

=== modified file 'cmd/snappy/cmd_login.go'
--- cmd/snappy/cmd_login.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_login.go	2015-05-18 19:06:00 +0000
@@ -44,7 +44,7 @@
 		longLoginHelp,
 		&cmdLogin{})
 	if err != nil {
-		logger.Panicf("unable to login: %v", err)
+		logger.Panicf("Unable to login: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_purge.go'
--- cmd/snappy/cmd_purge.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_purge.go	2015-05-18 19:06:00 +0000
@@ -41,7 +41,7 @@
 		longPurgeHelp,
 		&cmdPurge{})
 	if err != nil {
-		logger.Panicf("unable to purge: %v", err)
+		logger.Panicf("Unable to purge: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_remove.go'
--- cmd/snappy/cmd_remove.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_remove.go	2015-05-18 19:06:00 +0000
@@ -36,7 +36,7 @@
 		"Remove a snapp part",
 		&cmdRemove{})
 	if err != nil {
-		logger.Panicf("unable to remove: %v", err)
+		logger.Panicf("Unable to remove: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_rollback.go'
--- cmd/snappy/cmd_rollback.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_rollback.go	2015-05-18 19:06:00 +0000
@@ -44,7 +44,7 @@
 		longRollbackHelp,
 		&cmdRollback{})
 	if err != nil {
-		logger.Panicf("unable to rollback: %v", err)
+		logger.Panicf("Unable to rollback: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_search.go'
--- cmd/snappy/cmd_search.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_search.go	2015-05-18 19:06:00 +0000
@@ -36,7 +36,7 @@
 		"Query the store for available packages",
 		&cmdSearch{})
 	if err != nil {
-		logger.Panicf("unable to search: %v", err)
+		logger.Panicf("Unable to search: %v", err)
 	}
 
 	cmd.Aliases = append(cmd.Aliases, "se")

=== modified file 'cmd/snappy/cmd_set.go'
--- cmd/snappy/cmd_set.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_set.go	2015-05-18 19:06:00 +0000
@@ -44,7 +44,7 @@
 		setHelp,
 		&cmdSet{})
 	if err != nil {
-		logger.Panicf("unable to set: %v", err)
+		logger.Panicf("Unable to set: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_update.go'
--- cmd/snappy/cmd_update.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_update.go	2015-05-18 19:06:00 +0000
@@ -40,7 +40,7 @@
 		"Ensures system is running with latest parts",
 		&cmdUpdate{})
 	if err != nil {
-		logger.Panicf("unable to update: %v", err)
+		logger.Panicf("Unable to update: %v", err)
 	}
 }
 

=== modified file 'cmd/snappy/cmd_versions.go'
--- cmd/snappy/cmd_versions.go	2015-05-18 19:05:59 +0000
+++ cmd/snappy/cmd_versions.go	2015-05-18 19:06:00 +0000
@@ -36,7 +36,7 @@
 		longVersionsHelp,
 		&cmdVersions{})
 	if err != nil {
-		logger.Panicf("unable to versions: %v", err)
+		logger.Panicf("Unable to versions: %v", err)
 	}
 }
 

=== modified file 'partition/partition.go'
--- partition/partition.go	2015-03-30 14:56:46 +0000
+++ partition/partition.go	2015-05-18 19:06:00 +0000
@@ -31,6 +31,8 @@
 	"syscall"
 
 	"gopkg.in/yaml.v2"
+
+	"launchpad.net/snappy/logger"
 )
 
 var signalHandlerRegistered = false
@@ -246,8 +248,7 @@
 func signalHandler(sig os.Signal) {
 	err := undoMounts(false)
 	if err != nil {
-		// FIXME: use logger
-		fmt.Fprintf(os.Stderr, "ERROR: failed to unmount: %s", err)
+		logger.Noticef("Failed to unmount: %v", err)
 	}
 }
 

=== modified file 'partition/utils.go'
--- partition/utils.go	2015-03-26 09:12:58 +0000
+++ partition/utils.go	2015-05-18 19:06:00 +0000
@@ -39,14 +39,6 @@
 		return errors.New("no command specified")
 	}
 
-	// FIXME: use logger
-	/*
-		if debug == true {
-
-			log.debug('running: {}'.format(args))
-		}
-	*/
-
 	if out, err := exec.Command(args[0], args[1:]...).CombinedOutput(); err != nil {
 		cmdline := strings.Join(args, " ")
 		return fmt.Errorf("Failed to run command '%s': %s (%s)",

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-05-01 12:32:20 +0000
+++ snappy/click.go	2015-05-18 19:06:00 +0000
@@ -30,7 +30,6 @@
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"os/exec"
 	"path"
@@ -43,6 +42,7 @@
 
 	"launchpad.net/snappy/clickdeb"
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/policy"
 	"launchpad.net/snappy/systemd"
 
@@ -127,7 +127,7 @@
 		exitCode, err := helpers.ExitCode(err)
 		if err == nil {
 			if allowUnauthenticated && allowUnauthenticatedOkExitCode(exitCode) {
-				log.Println("Signature check failed, but installing anyway as requested")
+				logger.Noticef("Signature check failed, but installing anyway as requested")
 				return nil
 			}
 			return &ErrSignature{exitCode: exitCode}
@@ -195,7 +195,7 @@
 	for _, f := range hookFiles {
 		hook, err := readClickHookFile(f)
 		if err != nil {
-			log.Printf("Can't read hook file %s: %s", f, err)
+			logger.Noticef("Can't read hook file %q: %v", f, err)
 			continue
 		}
 		hooks[hook.name] = hook
@@ -235,7 +235,7 @@
 
 			systemHook, ok := systemHooks[hookName]
 			if !ok {
-				log.Printf("WARNING: Skipping hook %s", hookName)
+				logger.Noticef("Skipping hook %q", hookName)
 				continue
 			}
 
@@ -243,7 +243,7 @@
 
 			if _, err := os.Stat(dst); err == nil {
 				if err := os.Remove(dst); err != nil {
-					log.Printf("Warning: failed to remove %s: %s", dst, err)
+					logger.Noticef("Failed to remove %q: %v", dst, err)
 				}
 			}
 
@@ -635,12 +635,12 @@
 		}
 
 		if err := os.Remove(generateServiceFileName(m, service)); err != nil && !os.IsNotExist(err) {
-			log.Printf("Warning: failed to remove service file for %s: %v", serviceName, err)
+			logger.Noticef("Failed to remove service file for %q: %v", serviceName, err)
 		}
 
 		// Also remove DBus system policy file
 		if err := os.Remove(generateBusPolicyFileName(m, service)); err != nil && !os.IsNotExist(err) {
-			log.Printf("Warning: failed to remove bus policy file for service %s: %v", serviceName, err)
+			logger.Noticef("Failed to remove bus policy file for service %q: %v", serviceName, err)
 		}
 	}
 
@@ -868,7 +868,7 @@
 
 	manifestData, err := d.ControlMember("manifest")
 	if err != nil {
-		log.Printf("Snap inspect failed: %s", snapFile)
+		logger.Noticef("Snap inspect failed for %q: %v", snapFile, err)
 		return "", err
 	}
 
@@ -938,14 +938,14 @@
 	dataDir := filepath.Join(snapDataDir, fullName, manifest.Version)
 
 	if err := helpers.EnsureDir(instDir, 0755); err != nil {
-		log.Printf("WARNING: Can not create %s", instDir)
+		logger.Noticef("Can not create %q: %v", instDir, err)
 	}
 
 	// if anything goes wrong here we cleanup
 	defer func() {
 		if err != nil {
 			if e := os.RemoveAll(instDir); e != nil && !os.IsNotExist(e) {
-				log.Printf("Warning: failed to remove %s: %s", instDir, e)
+				logger.Noticef("Failed to remove %q: %v", instDir, e)
 			}
 		}
 	}()
@@ -991,7 +991,7 @@
 		defer func() {
 			if err != nil {
 				if cerr := setActiveClick(currentActiveDir, inhibitHooks, inter); cerr != nil {
-					log.Printf("setting old version back to active failed: %v", cerr)
+					logger.Noticef("Setting old version back to active failed: %v", cerr)
 				}
 			}
 		}()
@@ -1007,7 +1007,7 @@
 	defer func() {
 		if err != nil {
 			if cerr := removeSnapData(fullName, manifest.Version); cerr != nil {
-				log.Printf("when clenaning up data for %s %s: %v", manifest.Name, manifest.Version, cerr)
+				logger.Noticef("When cleaning up data for %s %s: %v", manifest.Name, manifest.Version, cerr)
 			}
 		}
 	}()
@@ -1021,7 +1021,7 @@
 	defer func() {
 		if err != nil && currentActiveDir != "" {
 			if cerr := setActiveClick(currentActiveDir, inhibitHooks, inter); cerr != nil {
-				log.Printf("when setting old %s version back to active: %v", manifest.Name, cerr)
+				logger.Noticef("When setting old %s version back to active: %v", manifest.Name, cerr)
 			}
 		}
 	}()
@@ -1211,7 +1211,7 @@
 
 	// and finally the current symlink
 	if err := os.Remove(currentSymlink); err != nil {
-		log.Printf("Warning: failed to remove %s: %s", currentSymlink, err)
+		logger.Noticef("Failed to remove %q: %v", currentSymlink, err)
 	}
 
 	return nil
@@ -1272,7 +1272,7 @@
 
 	// FIXME: we want to get rid of the current symlink
 	if err := os.Remove(currentActiveSymlink); err != nil && !os.IsNotExist(err) {
-		log.Printf("Warning: failed to remove %s: %s", currentActiveSymlink, err)
+		logger.Noticef("Failed to remove %q: %v", currentActiveSymlink, err)
 	}
 
 	// symlink is relative to parent dir

=== modified file 'snappy/dbus.go'
--- snappy/dbus.go	2015-05-18 19:05:59 +0000
+++ snappy/dbus.go	2015-05-18 19:06:00 +0000
@@ -75,7 +75,7 @@
 	}
 	if err := t.Execute(&templateOut, wrapperData); err != nil {
 		// this can never happen, except we forget a variable
-		logger.Panicf("unable to execute template: %v", err)
+		logger.Panicf("Unable to execute template: %v", err)
 	}
 
 	return templateOut.String(), nil

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-05-07 13:13:13 +0000
+++ snappy/errors.go	2015-05-18 19:06:00 +0000
@@ -84,10 +84,6 @@
 	// ErrInvalidCredentials is returned on login error
 	ErrInvalidCredentials = errors.New("invalid credentials")
 
-	// ErrInvalidPackageYaml is returned if a package.yaml file can not
-	// be parsed
-	ErrInvalidPackageYaml = errors.New("can not parse package.yaml")
-
 	// ErrInvalidFrameworkSpecInYaml is returned if a package.yaml
 	// has both frameworks and framework entries.
 	ErrInvalidFrameworkSpecInYaml = errors.New(`yaml can't have both "frameworks" and (deprecated) "framework" keys`)
@@ -141,6 +137,9 @@
 
 	// ErrInvalidPart is returned when something on the filesystem does not make sense
 	ErrInvalidPart = errors.New("invalid package on system")
+
+	// ErrInvalidSeccompPolicy is returned when policy-version and policy-vender are not set together
+	ErrInvalidSeccompPolicy = errors.New("policy-version and policy-vendor must be specified together")
 )
 
 // ErrInstallFailed is an error type for installation errors for snaps
@@ -256,3 +255,15 @@
 func (e ErrApparmorGenerate) Error() string {
 	return fmt.Sprintf("apparmor generate fails with %v: '%v'", e.exitCode, string(e.output))
 }
+
+// ErrInvalidYaml is returned if a yaml file can not be parsed
+type ErrInvalidYaml struct {
+	file string
+	err  error
+	yaml []byte
+}
+
+func (e *ErrInvalidYaml) Error() string {
+	// %#v of string(yaml) so the yaml is presented as a human-readable string, but in a single greppable line
+	return fmt.Sprintf("can not parse %s: %v (from: %#v)", e.file, e.err, string(e.yaml))
+}

=== modified file 'snappy/oem.go'
--- snappy/oem.go	2015-04-23 11:43:05 +0000
+++ snappy/oem.go	2015-05-18 19:06:00 +0000
@@ -24,13 +24,13 @@
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/logger"
 )
 
 // OEM represents the structure inside the package.yaml for the oem component
@@ -151,7 +151,7 @@
 		jsonAdditionalPath := filepath.Join(snapAppArmorDir, fmt.Sprintf("%s.json.additional", h.PartID))
 		err = os.Remove(jsonAdditionalPath)
 		if err != nil && !os.IsNotExist(err) {
-			log.Printf("Failed to remove %v: %v", jsonAdditionalPath, err)
+			logger.Noticef("Failed to remove %q: %v", jsonAdditionalPath, err)
 		}
 	}
 

=== modified file 'snappy/security.go'
--- snappy/security.go	2015-04-22 07:11:43 +0000
+++ snappy/security.go	2015-05-18 19:06:00 +0000
@@ -4,13 +4,14 @@
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"os/exec"
 	"path/filepath"
 	"strings"
 
 	"gopkg.in/yaml.v2"
+
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/logger"
 )
 
 type apparmorJSONTemplate struct {
@@ -133,7 +134,7 @@
 		fn := filepath.Join(baseDir, sd.SecurityPolicy.Seccomp)
 		content, err := ioutil.ReadFile(fn)
 		if err != nil {
-			log.Printf("WARNING: failed to read %s\n", fn)
+			logger.Noticef("Failed to read %q: %v", fn, err)
 		}
 		return content, err
 	}
@@ -155,7 +156,7 @@
 		var s securitySeccompOverride
 		err := readSeccompOverride(fn, &s)
 		if err != nil {
-			log.Printf("WARNING: failed to read %s\n", fn)
+			logger.Noticef("Failed to read %q: %v", fn, err)
 			return nil, err
 		}
 
@@ -196,7 +197,7 @@
 
 	content, err := runScFilterGen(args...)
 	if err != nil {
-		log.Printf("WARNING: %v failed\n", args)
+		logger.Noticef("%v failed", args)
 	}
 
 	return content, err
@@ -210,16 +211,11 @@
 
 	err = yaml.Unmarshal(yamlData, &s)
 	if err != nil {
-		log.Printf("ERROR: Can not parse '%s'", yamlData)
-		return err
+		return &ErrInvalidYaml{file: "package.yaml[seccomp override]", err: err, yaml: yamlData}
 	}
 	// These must always be specified together
-	if s.PolicyVersion == 0 && s.PolicyVendor != "" {
-		s.PolicyVendor = ""
-		log.Printf("WARNING: policy-version not set with policy-vendor. Skipping 'policy-vendor'\n")
-	} else if s.PolicyVersion != 0 && s.PolicyVendor == "" {
-		s.PolicyVersion = 0
-		log.Printf("WARNING: policy-vendor not set with policy-version. Skipping 'policy-version'\n")
+	if (s.PolicyVersion == 0 && s.PolicyVendor != "") || (s.PolicyVersion != 0 && s.PolicyVendor == "") {
+		return ErrInvalidSeccompPolicy
 	}
 
 	return nil

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-05-06 23:02:45 +0000
+++ snappy/snapp.go	2015-05-18 19:06:00 +0000
@@ -24,7 +24,6 @@
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -36,13 +35,14 @@
 	"strings"
 	"time"
 
+	"gopkg.in/yaml.v2"
+
 	"launchpad.net/snappy/clickdeb"
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/policy"
 	"launchpad.net/snappy/progress"
 	"launchpad.net/snappy/release"
-
-	"gopkg.in/yaml.v2"
 )
 
 const (
@@ -264,8 +264,7 @@
 	var m packageYaml
 	err := yaml.Unmarshal(yamlData, &m)
 	if err != nil {
-		log.Printf("Can not parse '%s'", yamlData)
-		return nil, err
+		return nil, &ErrInvalidYaml{file: "package.yaml", err: err, yaml: yamlData}
 	}
 
 	if m.Architectures == nil {
@@ -283,7 +282,7 @@
 	}
 
 	if m.DeprecatedFramework != "" {
-		log.Printf(`Use of deprecated "framework" key in yaml`)
+		logger.Noticef(`Use of deprecated "framework" key in yaml`)
 		if len(m.Frameworks) != 0 {
 			return nil, ErrInvalidFrameworkSpecInYaml
 		}
@@ -490,7 +489,7 @@
 	var h hashesYaml
 	err = yaml.Unmarshal(hashesData, &h)
 	if err != nil {
-		return nil, err
+		return nil, &ErrInvalidYaml{file: "hashes.yaml", err: err, yaml: hashesData}
 	}
 	part.hash = h.ArchiveSha512
 

=== modified file 'snappy/sort.go'
--- snappy/sort.go	2015-03-26 09:12:58 +0000
+++ snappy/sort.go	2015-05-18 19:06:00 +0000
@@ -18,10 +18,11 @@
 package snappy
 
 import (
-	"log"
 	"regexp"
 	"strconv"
 	"strings"
+
+	"launchpad.net/snappy/logger"
 )
 
 const (
@@ -147,11 +148,11 @@
 //   +1 if a is bigger than b
 func VersionCompare(va, vb string) (res int) {
 	if !VersionIsValid(va) {
-		log.Printf("Invalid version '%s', using '0' instead. Expect wrong results", va)
+		logger.Noticef("Invalid version %q, using '0' instead. Expect wrong results", va)
 		va = "0"
 	}
 	if !VersionIsValid(vb) {
-		log.Printf("Invalid version '%s', using '0' instead. Expect wrong results", vb)
+		logger.Noticef("Invalid version %q, using '0' instead. Expect wrong results", vb)
 		vb = "0"
 	}
 

=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go	2015-05-05 15:25:55 +0000
+++ snappy/systemimage.go	2015-05-18 19:06:00 +0000
@@ -21,18 +21,18 @@
 	"crypto/sha512"
 	"encoding/hex"
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"github.com/mvo5/goconfigparser"
+
 	"launchpad.net/snappy/coreconfig"
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/partition"
 	"launchpad.net/snappy/progress"
-
-	"github.com/mvo5/goconfigparser"
 )
 
 const (
@@ -327,12 +327,12 @@
 	defer f.Close()
 	err = cfg.Read(f)
 	if err != nil {
-		log.Printf("Can not parse config '%s': %s", channelIniPath, err)
+		logger.Noticef("Can not parse config %q: %v", channelIniPath, err)
 		return nil, err
 	}
 	st, err := os.Stat(channelIniPath)
 	if err != nil {
-		log.Printf("Can stat '%s': %s", channelIniPath, err)
+		logger.Noticef("Can not stat %q: %v", channelIniPath, err)
 		return nil, err
 	}
 
@@ -401,7 +401,7 @@
 		configFile := filepath.Join(systemImageRoot, otherRoot, systemImageChannelConfig)
 		part, err = makePartFromSystemImageConfigFile(p, configFile, false)
 		if err != nil {
-			log.Printf("Can not make system-image part for %s: %s", configFile, err)
+			logger.Noticef("Can not make system-image part for %q: %v", configFile, err)
 		}
 		return err
 	})

=== modified file 'systemd/systemd.go'
--- systemd/systemd.go	2015-05-18 19:05:59 +0000
+++ systemd/systemd.go	2015-05-18 19:06:00 +0000
@@ -216,7 +216,7 @@
 	}
 	if err := t.Execute(&templateOut, wrapperData); err != nil {
 		// this can never happen, except we forget a variable
-		logger.Panicf("unable to execute template: %v", err)
+		logger.Panicf("Unable to execute template: %v", err)
 	}
 
 	return templateOut.String()