Snappy

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

  1. no-more-log
  2. Merge into snappy-moved-to-github
Proposed by John Lenton
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 461
Merged at revision: 460
Proposed branch: lp:~chipaca/snappy/no-more-log
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Prerequisite: lp:~chipaca/snappy/different-logger
Diff against target: 743 lines (+81/-81)
31 files modified
cmd/snappy/cmd_booted.go (+1/-1)
cmd/snappy/cmd_build.go (+1/-1)
cmd/snappy/cmd_config.go (+1/-1)
cmd/snappy/cmd_first_boot.go (+1/-1)
cmd/snappy/cmd_hwassign.go (+1/-1)
cmd/snappy/cmd_hwinfo.go (+1/-1)
cmd/snappy/cmd_hwunassign.go (+1/-1)
cmd/snappy/cmd_info.go (+1/-1)
cmd/snappy/cmd_install.go (+1/-1)
cmd/snappy/cmd_internal_run_hooks.go (+1/-1)
cmd/snappy/cmd_internal_unpack.go (+1/-1)
cmd/snappy/cmd_list.go (+1/-1)
cmd/snappy/cmd_login.go (+1/-1)
cmd/snappy/cmd_purge.go (+1/-1)
cmd/snappy/cmd_remove.go (+1/-1)
cmd/snappy/cmd_rollback.go (+1/-1)
cmd/snappy/cmd_search.go (+1/-1)
cmd/snappy/cmd_set.go (+1/-1)
cmd/snappy/cmd_update.go (+1/-1)
cmd/snappy/cmd_versions.go (+1/-1)
partition/partition.go (+3/-2)
partition/utils.go (+0/-8)
snappy/click.go (+15/-15)
snappy/dbus.go (+1/-1)
snappy/errors.go (+15/-4)
snappy/oem.go (+2/-2)
snappy/security.go (+8/-12)
snappy/snapp.go (+6/-7)
snappy/sort.go (+4/-3)
snappy/systemimage.go (+6/-6)
systemd/systemd.go (+1/-1)
To merge this branch: bzr merge lp:~chipaca/snappy/no-more-log
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
Review via email: mp+258667@code.launchpad.net

Commit message

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

To post a comment you must log in.
lp:~chipaca/snappy/no-more-log updated
455. By John Lenton

oops, forgot an import

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

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

Revision history for this message
John Lenton (chipaca) wrote :

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 updated
456. By John Lenton

Merged different-logger into no-more-log.

457. By John Lenton

Merged different-logger into no-more-log.

458. By John Lenton

make vet and lint happy

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

> 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 updated
459. By John Lenton

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

460. By John Lenton

merged trunk

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

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

Revision history for this message
Sergio Schvezov (sergiusens) :
lp:~chipaca/snappy/no-more-log updated
461. By John Lenton

more error message homogeneization

Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/snappy/cmd_booted.go'
2--- cmd/snappy/cmd_booted.go 2015-05-18 19:05:59 +0000
3+++ cmd/snappy/cmd_booted.go 2015-05-18 19:06:00 +0000
4@@ -32,7 +32,7 @@
5 "internal",
6 &cmdBooted{})
7 if err != nil {
8- logger.Panicf("unable to booted: %v", err)
9+ logger.Panicf("Unable to booted: %v", err)
10 }
11 }
12
13
14=== modified file 'cmd/snappy/cmd_build.go'
15--- cmd/snappy/cmd_build.go 2015-05-18 19:05:59 +0000
16+++ cmd/snappy/cmd_build.go 2015-05-18 19:06:00 +0000
17@@ -38,7 +38,7 @@
18 longBuildHelp,
19 &cmdBuild{})
20 if err != nil {
21- logger.Panicf("unable to build: %v", err)
22+ logger.Panicf("Unable to build: %v", err)
23 }
24
25 cmd.Aliases = append(cmd.Aliases, "bu")
26
27=== modified file 'cmd/snappy/cmd_config.go'
28--- cmd/snappy/cmd_config.go 2015-05-18 19:05:59 +0000
29+++ cmd/snappy/cmd_config.go 2015-05-18 19:06:00 +0000
30@@ -44,7 +44,7 @@
31 longConfigHelp,
32 &cmdConfig{})
33 if err != nil {
34- logger.Panicf("unable to config: %v", err)
35+ logger.Panicf("Unable to config: %v", err)
36 }
37 }
38
39
40=== modified file 'cmd/snappy/cmd_first_boot.go'
41--- cmd/snappy/cmd_first_boot.go 2015-05-18 19:05:59 +0000
42+++ cmd/snappy/cmd_first_boot.go 2015-05-18 19:06:00 +0000
43@@ -32,7 +32,7 @@
44 "internal",
45 &cmdInternalFirstBootOemConfig{})
46 if err != nil {
47- logger.Panicf("unable to first_boot: %v", err)
48+ logger.Panicf("Unable to first_boot: %v", err)
49 }
50 }
51
52
53=== modified file 'cmd/snappy/cmd_hwassign.go'
54--- cmd/snappy/cmd_hwassign.go 2015-05-18 19:05:59 +0000
55+++ cmd/snappy/cmd_hwassign.go 2015-05-18 19:06:00 +0000
56@@ -42,7 +42,7 @@
57 longHWAssignHelp,
58 &cmdHWAssign{})
59 if err != nil {
60- logger.Panicf("unable to hwassign: %v", err)
61+ logger.Panicf("Unable to hwassign: %v", err)
62 }
63 }
64
65
66=== modified file 'cmd/snappy/cmd_hwinfo.go'
67--- cmd/snappy/cmd_hwinfo.go 2015-05-18 19:05:59 +0000
68+++ cmd/snappy/cmd_hwinfo.go 2015-05-18 19:06:00 +0000
69@@ -42,7 +42,7 @@
70 longHWInfoHelp,
71 &cmdHWInfo{})
72 if err != nil {
73- logger.Panicf("unable to hwinfo: %v", err)
74+ logger.Panicf("Unable to hwinfo: %v", err)
75 }
76 }
77
78
79=== modified file 'cmd/snappy/cmd_hwunassign.go'
80--- cmd/snappy/cmd_hwunassign.go 2015-05-18 19:05:59 +0000
81+++ cmd/snappy/cmd_hwunassign.go 2015-05-18 19:06:00 +0000
82@@ -42,7 +42,7 @@
83 longHWUnassignHelp,
84 &cmdHWUnassign{})
85 if err != nil {
86- logger.Panicf("unable to hwunassign: %v", err)
87+ logger.Panicf("Unable to hwunassign: %v", err)
88 }
89 }
90
91
92=== modified file 'cmd/snappy/cmd_info.go'
93--- cmd/snappy/cmd_info.go 2015-05-18 19:05:59 +0000
94+++ cmd/snappy/cmd_info.go 2015-05-18 19:06:00 +0000
95@@ -48,7 +48,7 @@
96 longInfoHelp,
97 &cmdInfo{})
98 if err != nil {
99- logger.Panicf("unable to info: %v", err)
100+ logger.Panicf("Unable to info: %v", err)
101 }
102 }
103
104
105=== modified file 'cmd/snappy/cmd_install.go'
106--- cmd/snappy/cmd_install.go 2015-05-18 19:05:59 +0000
107+++ cmd/snappy/cmd_install.go 2015-05-18 19:06:00 +0000
108@@ -43,7 +43,7 @@
109 "Install a snap package",
110 &cmdInstall{})
111 if err != nil {
112- logger.Panicf("unable to install: %v", err)
113+ logger.Panicf("Unable to install: %v", err)
114 }
115 }
116
117
118=== modified file 'cmd/snappy/cmd_internal_run_hooks.go'
119--- cmd/snappy/cmd_internal_run_hooks.go 2015-05-18 19:05:59 +0000
120+++ cmd/snappy/cmd_internal_run_hooks.go 2015-05-18 19:06:00 +0000
121@@ -14,7 +14,7 @@
122 "internal",
123 &cmdInternalRunHooks{})
124 if err != nil {
125- logger.Panicf("unable to internal_run_hooks: %v", err)
126+ logger.Panicf("Unable to internal_run_hooks: %v", err)
127 }
128 }
129
130
131=== modified file 'cmd/snappy/cmd_internal_unpack.go'
132--- cmd/snappy/cmd_internal_unpack.go 2015-05-18 19:05:59 +0000
133+++ cmd/snappy/cmd_internal_unpack.go 2015-05-18 19:06:00 +0000
134@@ -151,7 +151,7 @@
135 "internal",
136 &cmdInternalUnpack{})
137 if err != nil {
138- logger.Panicf("unable to internal_unpack: %v", err)
139+ logger.Panicf("Unable to internal_unpack: %v", err)
140 }
141 }
142
143
144=== modified file 'cmd/snappy/cmd_list.go'
145--- cmd/snappy/cmd_list.go 2015-05-18 19:05:59 +0000
146+++ cmd/snappy/cmd_list.go 2015-05-18 19:06:00 +0000
147@@ -49,7 +49,7 @@
148 longListHelp,
149 &cmdList{})
150 if err != nil {
151- logger.Panicf("unable to list: %v", err)
152+ logger.Panicf("Unable to list: %v", err)
153 }
154
155 cmd.Aliases = append(cmd.Aliases, "li")
156
157=== modified file 'cmd/snappy/cmd_login.go'
158--- cmd/snappy/cmd_login.go 2015-05-18 19:05:59 +0000
159+++ cmd/snappy/cmd_login.go 2015-05-18 19:06:00 +0000
160@@ -44,7 +44,7 @@
161 longLoginHelp,
162 &cmdLogin{})
163 if err != nil {
164- logger.Panicf("unable to login: %v", err)
165+ logger.Panicf("Unable to login: %v", err)
166 }
167 }
168
169
170=== modified file 'cmd/snappy/cmd_purge.go'
171--- cmd/snappy/cmd_purge.go 2015-05-18 19:05:59 +0000
172+++ cmd/snappy/cmd_purge.go 2015-05-18 19:06:00 +0000
173@@ -41,7 +41,7 @@
174 longPurgeHelp,
175 &cmdPurge{})
176 if err != nil {
177- logger.Panicf("unable to purge: %v", err)
178+ logger.Panicf("Unable to purge: %v", err)
179 }
180 }
181
182
183=== modified file 'cmd/snappy/cmd_remove.go'
184--- cmd/snappy/cmd_remove.go 2015-05-18 19:05:59 +0000
185+++ cmd/snappy/cmd_remove.go 2015-05-18 19:06:00 +0000
186@@ -36,7 +36,7 @@
187 "Remove a snapp part",
188 &cmdRemove{})
189 if err != nil {
190- logger.Panicf("unable to remove: %v", err)
191+ logger.Panicf("Unable to remove: %v", err)
192 }
193 }
194
195
196=== modified file 'cmd/snappy/cmd_rollback.go'
197--- cmd/snappy/cmd_rollback.go 2015-05-18 19:05:59 +0000
198+++ cmd/snappy/cmd_rollback.go 2015-05-18 19:06:00 +0000
199@@ -44,7 +44,7 @@
200 longRollbackHelp,
201 &cmdRollback{})
202 if err != nil {
203- logger.Panicf("unable to rollback: %v", err)
204+ logger.Panicf("Unable to rollback: %v", err)
205 }
206 }
207
208
209=== modified file 'cmd/snappy/cmd_search.go'
210--- cmd/snappy/cmd_search.go 2015-05-18 19:05:59 +0000
211+++ cmd/snappy/cmd_search.go 2015-05-18 19:06:00 +0000
212@@ -36,7 +36,7 @@
213 "Query the store for available packages",
214 &cmdSearch{})
215 if err != nil {
216- logger.Panicf("unable to search: %v", err)
217+ logger.Panicf("Unable to search: %v", err)
218 }
219
220 cmd.Aliases = append(cmd.Aliases, "se")
221
222=== modified file 'cmd/snappy/cmd_set.go'
223--- cmd/snappy/cmd_set.go 2015-05-18 19:05:59 +0000
224+++ cmd/snappy/cmd_set.go 2015-05-18 19:06:00 +0000
225@@ -44,7 +44,7 @@
226 setHelp,
227 &cmdSet{})
228 if err != nil {
229- logger.Panicf("unable to set: %v", err)
230+ logger.Panicf("Unable to set: %v", err)
231 }
232 }
233
234
235=== modified file 'cmd/snappy/cmd_update.go'
236--- cmd/snappy/cmd_update.go 2015-05-18 19:05:59 +0000
237+++ cmd/snappy/cmd_update.go 2015-05-18 19:06:00 +0000
238@@ -40,7 +40,7 @@
239 "Ensures system is running with latest parts",
240 &cmdUpdate{})
241 if err != nil {
242- logger.Panicf("unable to update: %v", err)
243+ logger.Panicf("Unable to update: %v", err)
244 }
245 }
246
247
248=== modified file 'cmd/snappy/cmd_versions.go'
249--- cmd/snappy/cmd_versions.go 2015-05-18 19:05:59 +0000
250+++ cmd/snappy/cmd_versions.go 2015-05-18 19:06:00 +0000
251@@ -36,7 +36,7 @@
252 longVersionsHelp,
253 &cmdVersions{})
254 if err != nil {
255- logger.Panicf("unable to versions: %v", err)
256+ logger.Panicf("Unable to versions: %v", err)
257 }
258 }
259
260
261=== modified file 'partition/partition.go'
262--- partition/partition.go 2015-03-30 14:56:46 +0000
263+++ partition/partition.go 2015-05-18 19:06:00 +0000
264@@ -31,6 +31,8 @@
265 "syscall"
266
267 "gopkg.in/yaml.v2"
268+
269+ "launchpad.net/snappy/logger"
270 )
271
272 var signalHandlerRegistered = false
273@@ -246,8 +248,7 @@
274 func signalHandler(sig os.Signal) {
275 err := undoMounts(false)
276 if err != nil {
277- // FIXME: use logger
278- fmt.Fprintf(os.Stderr, "ERROR: failed to unmount: %s", err)
279+ logger.Noticef("Failed to unmount: %v", err)
280 }
281 }
282
283
284=== modified file 'partition/utils.go'
285--- partition/utils.go 2015-03-26 09:12:58 +0000
286+++ partition/utils.go 2015-05-18 19:06:00 +0000
287@@ -39,14 +39,6 @@
288 return errors.New("no command specified")
289 }
290
291- // FIXME: use logger
292- /*
293- if debug == true {
294-
295- log.debug('running: {}'.format(args))
296- }
297- */
298-
299 if out, err := exec.Command(args[0], args[1:]...).CombinedOutput(); err != nil {
300 cmdline := strings.Join(args, " ")
301 return fmt.Errorf("Failed to run command '%s': %s (%s)",
302
303=== modified file 'snappy/click.go'
304--- snappy/click.go 2015-05-01 12:32:20 +0000
305+++ snappy/click.go 2015-05-18 19:06:00 +0000
306@@ -30,7 +30,6 @@
307 "encoding/json"
308 "fmt"
309 "io/ioutil"
310- "log"
311 "os"
312 "os/exec"
313 "path"
314@@ -43,6 +42,7 @@
315
316 "launchpad.net/snappy/clickdeb"
317 "launchpad.net/snappy/helpers"
318+ "launchpad.net/snappy/logger"
319 "launchpad.net/snappy/policy"
320 "launchpad.net/snappy/systemd"
321
322@@ -127,7 +127,7 @@
323 exitCode, err := helpers.ExitCode(err)
324 if err == nil {
325 if allowUnauthenticated && allowUnauthenticatedOkExitCode(exitCode) {
326- log.Println("Signature check failed, but installing anyway as requested")
327+ logger.Noticef("Signature check failed, but installing anyway as requested")
328 return nil
329 }
330 return &ErrSignature{exitCode: exitCode}
331@@ -195,7 +195,7 @@
332 for _, f := range hookFiles {
333 hook, err := readClickHookFile(f)
334 if err != nil {
335- log.Printf("Can't read hook file %s: %s", f, err)
336+ logger.Noticef("Can't read hook file %q: %v", f, err)
337 continue
338 }
339 hooks[hook.name] = hook
340@@ -235,7 +235,7 @@
341
342 systemHook, ok := systemHooks[hookName]
343 if !ok {
344- log.Printf("WARNING: Skipping hook %s", hookName)
345+ logger.Noticef("Skipping hook %q", hookName)
346 continue
347 }
348
349@@ -243,7 +243,7 @@
350
351 if _, err := os.Stat(dst); err == nil {
352 if err := os.Remove(dst); err != nil {
353- log.Printf("Warning: failed to remove %s: %s", dst, err)
354+ logger.Noticef("Failed to remove %q: %v", dst, err)
355 }
356 }
357
358@@ -635,12 +635,12 @@
359 }
360
361 if err := os.Remove(generateServiceFileName(m, service)); err != nil && !os.IsNotExist(err) {
362- log.Printf("Warning: failed to remove service file for %s: %v", serviceName, err)
363+ logger.Noticef("Failed to remove service file for %q: %v", serviceName, err)
364 }
365
366 // Also remove DBus system policy file
367 if err := os.Remove(generateBusPolicyFileName(m, service)); err != nil && !os.IsNotExist(err) {
368- log.Printf("Warning: failed to remove bus policy file for service %s: %v", serviceName, err)
369+ logger.Noticef("Failed to remove bus policy file for service %q: %v", serviceName, err)
370 }
371 }
372
373@@ -868,7 +868,7 @@
374
375 manifestData, err := d.ControlMember("manifest")
376 if err != nil {
377- log.Printf("Snap inspect failed: %s", snapFile)
378+ logger.Noticef("Snap inspect failed for %q: %v", snapFile, err)
379 return "", err
380 }
381
382@@ -938,14 +938,14 @@
383 dataDir := filepath.Join(snapDataDir, fullName, manifest.Version)
384
385 if err := helpers.EnsureDir(instDir, 0755); err != nil {
386- log.Printf("WARNING: Can not create %s", instDir)
387+ logger.Noticef("Can not create %q: %v", instDir, err)
388 }
389
390 // if anything goes wrong here we cleanup
391 defer func() {
392 if err != nil {
393 if e := os.RemoveAll(instDir); e != nil && !os.IsNotExist(e) {
394- log.Printf("Warning: failed to remove %s: %s", instDir, e)
395+ logger.Noticef("Failed to remove %q: %v", instDir, e)
396 }
397 }
398 }()
399@@ -991,7 +991,7 @@
400 defer func() {
401 if err != nil {
402 if cerr := setActiveClick(currentActiveDir, inhibitHooks, inter); cerr != nil {
403- log.Printf("setting old version back to active failed: %v", cerr)
404+ logger.Noticef("Setting old version back to active failed: %v", cerr)
405 }
406 }
407 }()
408@@ -1007,7 +1007,7 @@
409 defer func() {
410 if err != nil {
411 if cerr := removeSnapData(fullName, manifest.Version); cerr != nil {
412- log.Printf("when clenaning up data for %s %s: %v", manifest.Name, manifest.Version, cerr)
413+ logger.Noticef("When cleaning up data for %s %s: %v", manifest.Name, manifest.Version, cerr)
414 }
415 }
416 }()
417@@ -1021,7 +1021,7 @@
418 defer func() {
419 if err != nil && currentActiveDir != "" {
420 if cerr := setActiveClick(currentActiveDir, inhibitHooks, inter); cerr != nil {
421- log.Printf("when setting old %s version back to active: %v", manifest.Name, cerr)
422+ logger.Noticef("When setting old %s version back to active: %v", manifest.Name, cerr)
423 }
424 }
425 }()
426@@ -1211,7 +1211,7 @@
427
428 // and finally the current symlink
429 if err := os.Remove(currentSymlink); err != nil {
430- log.Printf("Warning: failed to remove %s: %s", currentSymlink, err)
431+ logger.Noticef("Failed to remove %q: %v", currentSymlink, err)
432 }
433
434 return nil
435@@ -1272,7 +1272,7 @@
436
437 // FIXME: we want to get rid of the current symlink
438 if err := os.Remove(currentActiveSymlink); err != nil && !os.IsNotExist(err) {
439- log.Printf("Warning: failed to remove %s: %s", currentActiveSymlink, err)
440+ logger.Noticef("Failed to remove %q: %v", currentActiveSymlink, err)
441 }
442
443 // symlink is relative to parent dir
444
445=== modified file 'snappy/dbus.go'
446--- snappy/dbus.go 2015-05-18 19:05:59 +0000
447+++ snappy/dbus.go 2015-05-18 19:06:00 +0000
448@@ -75,7 +75,7 @@
449 }
450 if err := t.Execute(&templateOut, wrapperData); err != nil {
451 // this can never happen, except we forget a variable
452- logger.Panicf("unable to execute template: %v", err)
453+ logger.Panicf("Unable to execute template: %v", err)
454 }
455
456 return templateOut.String(), nil
457
458=== modified file 'snappy/errors.go'
459--- snappy/errors.go 2015-05-07 13:13:13 +0000
460+++ snappy/errors.go 2015-05-18 19:06:00 +0000
461@@ -84,10 +84,6 @@
462 // ErrInvalidCredentials is returned on login error
463 ErrInvalidCredentials = errors.New("invalid credentials")
464
465- // ErrInvalidPackageYaml is returned if a package.yaml file can not
466- // be parsed
467- ErrInvalidPackageYaml = errors.New("can not parse package.yaml")
468-
469 // ErrInvalidFrameworkSpecInYaml is returned if a package.yaml
470 // has both frameworks and framework entries.
471 ErrInvalidFrameworkSpecInYaml = errors.New(`yaml can't have both "frameworks" and (deprecated) "framework" keys`)
472@@ -141,6 +137,9 @@
473
474 // ErrInvalidPart is returned when something on the filesystem does not make sense
475 ErrInvalidPart = errors.New("invalid package on system")
476+
477+ // ErrInvalidSeccompPolicy is returned when policy-version and policy-vender are not set together
478+ ErrInvalidSeccompPolicy = errors.New("policy-version and policy-vendor must be specified together")
479 )
480
481 // ErrInstallFailed is an error type for installation errors for snaps
482@@ -256,3 +255,15 @@
483 func (e ErrApparmorGenerate) Error() string {
484 return fmt.Sprintf("apparmor generate fails with %v: '%v'", e.exitCode, string(e.output))
485 }
486+
487+// ErrInvalidYaml is returned if a yaml file can not be parsed
488+type ErrInvalidYaml struct {
489+ file string
490+ err error
491+ yaml []byte
492+}
493+
494+func (e *ErrInvalidYaml) Error() string {
495+ // %#v of string(yaml) so the yaml is presented as a human-readable string, but in a single greppable line
496+ return fmt.Sprintf("can not parse %s: %v (from: %#v)", e.file, e.err, string(e.yaml))
497+}
498
499=== modified file 'snappy/oem.go'
500--- snappy/oem.go 2015-04-23 11:43:05 +0000
501+++ snappy/oem.go 2015-05-18 19:06:00 +0000
502@@ -24,13 +24,13 @@
503 "errors"
504 "fmt"
505 "io/ioutil"
506- "log"
507 "os"
508 "os/exec"
509 "path/filepath"
510 "strings"
511
512 "launchpad.net/snappy/helpers"
513+ "launchpad.net/snappy/logger"
514 )
515
516 // OEM represents the structure inside the package.yaml for the oem component
517@@ -151,7 +151,7 @@
518 jsonAdditionalPath := filepath.Join(snapAppArmorDir, fmt.Sprintf("%s.json.additional", h.PartID))
519 err = os.Remove(jsonAdditionalPath)
520 if err != nil && !os.IsNotExist(err) {
521- log.Printf("Failed to remove %v: %v", jsonAdditionalPath, err)
522+ logger.Noticef("Failed to remove %q: %v", jsonAdditionalPath, err)
523 }
524 }
525
526
527=== modified file 'snappy/security.go'
528--- snappy/security.go 2015-04-22 07:11:43 +0000
529+++ snappy/security.go 2015-05-18 19:06:00 +0000
530@@ -4,13 +4,14 @@
531 "encoding/json"
532 "fmt"
533 "io/ioutil"
534- "log"
535 "os/exec"
536 "path/filepath"
537 "strings"
538
539 "gopkg.in/yaml.v2"
540+
541 "launchpad.net/snappy/helpers"
542+ "launchpad.net/snappy/logger"
543 )
544
545 type apparmorJSONTemplate struct {
546@@ -133,7 +134,7 @@
547 fn := filepath.Join(baseDir, sd.SecurityPolicy.Seccomp)
548 content, err := ioutil.ReadFile(fn)
549 if err != nil {
550- log.Printf("WARNING: failed to read %s\n", fn)
551+ logger.Noticef("Failed to read %q: %v", fn, err)
552 }
553 return content, err
554 }
555@@ -155,7 +156,7 @@
556 var s securitySeccompOverride
557 err := readSeccompOverride(fn, &s)
558 if err != nil {
559- log.Printf("WARNING: failed to read %s\n", fn)
560+ logger.Noticef("Failed to read %q: %v", fn, err)
561 return nil, err
562 }
563
564@@ -196,7 +197,7 @@
565
566 content, err := runScFilterGen(args...)
567 if err != nil {
568- log.Printf("WARNING: %v failed\n", args)
569+ logger.Noticef("%v failed", args)
570 }
571
572 return content, err
573@@ -210,16 +211,11 @@
574
575 err = yaml.Unmarshal(yamlData, &s)
576 if err != nil {
577- log.Printf("ERROR: Can not parse '%s'", yamlData)
578- return err
579+ return &ErrInvalidYaml{file: "package.yaml[seccomp override]", err: err, yaml: yamlData}
580 }
581 // These must always be specified together
582- if s.PolicyVersion == 0 && s.PolicyVendor != "" {
583- s.PolicyVendor = ""
584- log.Printf("WARNING: policy-version not set with policy-vendor. Skipping 'policy-vendor'\n")
585- } else if s.PolicyVersion != 0 && s.PolicyVendor == "" {
586- s.PolicyVersion = 0
587- log.Printf("WARNING: policy-vendor not set with policy-version. Skipping 'policy-version'\n")
588+ if (s.PolicyVersion == 0 && s.PolicyVendor != "") || (s.PolicyVersion != 0 && s.PolicyVendor == "") {
589+ return ErrInvalidSeccompPolicy
590 }
591
592 return nil
593
594=== modified file 'snappy/snapp.go'
595--- snappy/snapp.go 2015-05-06 23:02:45 +0000
596+++ snappy/snapp.go 2015-05-18 19:06:00 +0000
597@@ -24,7 +24,6 @@
598 "fmt"
599 "io"
600 "io/ioutil"
601- "log"
602 "net/http"
603 "net/url"
604 "os"
605@@ -36,13 +35,14 @@
606 "strings"
607 "time"
608
609+ "gopkg.in/yaml.v2"
610+
611 "launchpad.net/snappy/clickdeb"
612 "launchpad.net/snappy/helpers"
613+ "launchpad.net/snappy/logger"
614 "launchpad.net/snappy/policy"
615 "launchpad.net/snappy/progress"
616 "launchpad.net/snappy/release"
617-
618- "gopkg.in/yaml.v2"
619 )
620
621 const (
622@@ -264,8 +264,7 @@
623 var m packageYaml
624 err := yaml.Unmarshal(yamlData, &m)
625 if err != nil {
626- log.Printf("Can not parse '%s'", yamlData)
627- return nil, err
628+ return nil, &ErrInvalidYaml{file: "package.yaml", err: err, yaml: yamlData}
629 }
630
631 if m.Architectures == nil {
632@@ -283,7 +282,7 @@
633 }
634
635 if m.DeprecatedFramework != "" {
636- log.Printf(`Use of deprecated "framework" key in yaml`)
637+ logger.Noticef(`Use of deprecated "framework" key in yaml`)
638 if len(m.Frameworks) != 0 {
639 return nil, ErrInvalidFrameworkSpecInYaml
640 }
641@@ -490,7 +489,7 @@
642 var h hashesYaml
643 err = yaml.Unmarshal(hashesData, &h)
644 if err != nil {
645- return nil, err
646+ return nil, &ErrInvalidYaml{file: "hashes.yaml", err: err, yaml: hashesData}
647 }
648 part.hash = h.ArchiveSha512
649
650
651=== modified file 'snappy/sort.go'
652--- snappy/sort.go 2015-03-26 09:12:58 +0000
653+++ snappy/sort.go 2015-05-18 19:06:00 +0000
654@@ -18,10 +18,11 @@
655 package snappy
656
657 import (
658- "log"
659 "regexp"
660 "strconv"
661 "strings"
662+
663+ "launchpad.net/snappy/logger"
664 )
665
666 const (
667@@ -147,11 +148,11 @@
668 // +1 if a is bigger than b
669 func VersionCompare(va, vb string) (res int) {
670 if !VersionIsValid(va) {
671- log.Printf("Invalid version '%s', using '0' instead. Expect wrong results", va)
672+ logger.Noticef("Invalid version %q, using '0' instead. Expect wrong results", va)
673 va = "0"
674 }
675 if !VersionIsValid(vb) {
676- log.Printf("Invalid version '%s', using '0' instead. Expect wrong results", vb)
677+ logger.Noticef("Invalid version %q, using '0' instead. Expect wrong results", vb)
678 vb = "0"
679 }
680
681
682=== modified file 'snappy/systemimage.go'
683--- snappy/systemimage.go 2015-05-05 15:25:55 +0000
684+++ snappy/systemimage.go 2015-05-18 19:06:00 +0000
685@@ -21,18 +21,18 @@
686 "crypto/sha512"
687 "encoding/hex"
688 "fmt"
689- "log"
690 "os"
691 "path/filepath"
692 "strings"
693 "time"
694
695+ "github.com/mvo5/goconfigparser"
696+
697 "launchpad.net/snappy/coreconfig"
698 "launchpad.net/snappy/helpers"
699+ "launchpad.net/snappy/logger"
700 "launchpad.net/snappy/partition"
701 "launchpad.net/snappy/progress"
702-
703- "github.com/mvo5/goconfigparser"
704 )
705
706 const (
707@@ -327,12 +327,12 @@
708 defer f.Close()
709 err = cfg.Read(f)
710 if err != nil {
711- log.Printf("Can not parse config '%s': %s", channelIniPath, err)
712+ logger.Noticef("Can not parse config %q: %v", channelIniPath, err)
713 return nil, err
714 }
715 st, err := os.Stat(channelIniPath)
716 if err != nil {
717- log.Printf("Can stat '%s': %s", channelIniPath, err)
718+ logger.Noticef("Can not stat %q: %v", channelIniPath, err)
719 return nil, err
720 }
721
722@@ -401,7 +401,7 @@
723 configFile := filepath.Join(systemImageRoot, otherRoot, systemImageChannelConfig)
724 part, err = makePartFromSystemImageConfigFile(p, configFile, false)
725 if err != nil {
726- log.Printf("Can not make system-image part for %s: %s", configFile, err)
727+ logger.Noticef("Can not make system-image part for %q: %v", configFile, err)
728 }
729 return err
730 })
731
732=== modified file 'systemd/systemd.go'
733--- systemd/systemd.go 2015-05-18 19:05:59 +0000
734+++ systemd/systemd.go 2015-05-18 19:06:00 +0000
735@@ -216,7 +216,7 @@
736 }
737 if err := t.Execute(&templateOut, wrapperData); err != nil {
738 // this can never happen, except we forget a variable
739- logger.Panicf("unable to execute template: %v", err)
740+ logger.Panicf("Unable to execute template: %v", err)
741 }
742
743 return templateOut.String()

Subscribers

People subscribed via source and target branches