Snappy

Merge lp:~rsalveti/snappy/15.04-fixing-lint-errors into lp:~snappy-dev/snappy/15.04-deprecated

  1. 15.04-fixing-lint-errors
  2. Merge into 15.04-deprecated
Proposed by Ricardo Salveti
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 453
Merged at revision: 453
Proposed branch: lp:~rsalveti/snappy/15.04-fixing-lint-errors
Merge into: lp:~snappy-dev/snappy/15.04-deprecated
Diff against target: 89 lines (+10/-8)
3 files modified
cmd/snappy/cmd_internal_unpack.go (+3/-3)
cmd/snappy/cmd_low_level_unpack_test.go (+5/-5)
helpers/touch.go (+2/-0)
To merge this branch: bzr merge lp:~rsalveti/snappy/15.04-fixing-lint-errors
Reviewer Review Type Date Requested Status
Michael Terry (community) Approve
Review via email: mp+263956@code.launchpad.net

Commit message

Fixing lint errors

Description of the change

Fixing lint errors

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

LGTM

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_internal_unpack.go'
2--- cmd/snappy/cmd_internal_unpack.go 2015-06-03 19:15:31 +0000
3+++ cmd/snappy/cmd_internal_unpack.go 2015-07-06 18:51:26 +0000
4@@ -67,7 +67,7 @@
5 return filepath.Join("/etc/", file)
6 }
7
8-func readUid(user, passwdFile string) (uid int, err error) {
9+func readUID(user, passwdFile string) (uid int, err error) {
10 f, err := os.Open(passwdFile)
11 if err != nil {
12 return -1, err
13@@ -100,13 +100,13 @@
14 if helpers.ShouldDropPrivs() {
15
16 passFile := passwdFile(rootDir, "passwd")
17- uid, err := readUid(dropPrivsUser, passFile)
18+ uid, err := readUID(dropPrivsUser, passFile)
19 if err != nil {
20 return err
21 }
22
23 groupFile := passwdFile(rootDir, "group")
24- gid, err := readUid(dropPrivsUser, groupFile)
25+ gid, err := readUID(dropPrivsUser, groupFile)
26 if err != nil {
27 return err
28 }
29
30=== modified file 'cmd/snappy/cmd_low_level_unpack_test.go'
31--- cmd/snappy/cmd_low_level_unpack_test.go 2015-03-31 18:58:03 +0000
32+++ cmd/snappy/cmd_low_level_unpack_test.go 2015-07-06 18:51:26 +0000
33@@ -40,7 +40,7 @@
34 clickpkg:x:101:104::/nonexistent:/bin/false
35 `)
36
37- uid, err := readUid("clickpkg", f.Name())
38+ uid, err := readUID("clickpkg", f.Name())
39 c.Assert(err, IsNil)
40 c.Assert(uid, Equals, 101)
41 }
42@@ -51,7 +51,7 @@
43 clickpkg:x:104:
44 `)
45
46- gid, err := readUid("clickpkg", f.Name())
47+ gid, err := readUID("clickpkg", f.Name())
48 c.Assert(err, IsNil)
49 c.Assert(gid, Equals, 104)
50 }
51@@ -64,7 +64,7 @@
52 `)
53 defer os.Remove(f.Name())
54
55- uid, err := readUid("clickpkg", f.Name())
56+ uid, err := readUID("clickpkg", f.Name())
57 c.Assert(err, IsNil)
58 c.Assert(uid, Equals, 102)
59 }
60@@ -75,7 +75,7 @@
61 clickpkg:x:
62 `)
63
64- _, err := readUid("clickpkg", f.Name())
65+ _, err := readUID("clickpkg", f.Name())
66 c.Assert(err, NotNil)
67 }
68
69@@ -84,6 +84,6 @@
70 daemon:
71 `)
72
73- _, err := readUid("clickpkg", f.Name())
74+ _, err := readUID("clickpkg", f.Name())
75 c.Assert(err, NotNil)
76 }
77
78=== modified file 'helpers/touch.go'
79--- helpers/touch.go 2015-04-13 17:00:53 +0000
80+++ helpers/touch.go 2015-07-06 18:51:26 +0000
81@@ -36,6 +36,8 @@
82 "unsafe"
83 )
84
85+// ErrNotAbsPath is returned when an absolute path is needed but the received
86+// path is not.
87 var ErrNotAbsPath = errors.New("not an absolute path")
88
89 // UpdateTimestamp updates the timestamp of the file at pathname. It does not

Subscribers

People subscribed via source and target branches