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
=== modified file 'cmd/snappy/cmd_internal_unpack.go'
--- cmd/snappy/cmd_internal_unpack.go 2015-06-03 19:15:31 +0000
+++ cmd/snappy/cmd_internal_unpack.go 2015-07-06 18:51:26 +0000
@@ -67,7 +67,7 @@
67 return filepath.Join("/etc/", file)67 return filepath.Join("/etc/", file)
68}68}
6969
70func readUid(user, passwdFile string) (uid int, err error) {70func readUID(user, passwdFile string) (uid int, err error) {
71 f, err := os.Open(passwdFile)71 f, err := os.Open(passwdFile)
72 if err != nil {72 if err != nil {
73 return -1, err73 return -1, err
@@ -100,13 +100,13 @@
100 if helpers.ShouldDropPrivs() {100 if helpers.ShouldDropPrivs() {
101101
102 passFile := passwdFile(rootDir, "passwd")102 passFile := passwdFile(rootDir, "passwd")
103 uid, err := readUid(dropPrivsUser, passFile)103 uid, err := readUID(dropPrivsUser, passFile)
104 if err != nil {104 if err != nil {
105 return err105 return err
106 }106 }
107107
108 groupFile := passwdFile(rootDir, "group")108 groupFile := passwdFile(rootDir, "group")
109 gid, err := readUid(dropPrivsUser, groupFile)109 gid, err := readUID(dropPrivsUser, groupFile)
110 if err != nil {110 if err != nil {
111 return err111 return err
112 }112 }
113113
=== modified file 'cmd/snappy/cmd_low_level_unpack_test.go'
--- cmd/snappy/cmd_low_level_unpack_test.go 2015-03-31 18:58:03 +0000
+++ cmd/snappy/cmd_low_level_unpack_test.go 2015-07-06 18:51:26 +0000
@@ -40,7 +40,7 @@
40clickpkg:x:101:104::/nonexistent:/bin/false40clickpkg:x:101:104::/nonexistent:/bin/false
41`)41`)
4242
43 uid, err := readUid("clickpkg", f.Name())43 uid, err := readUID("clickpkg", f.Name())
44 c.Assert(err, IsNil)44 c.Assert(err, IsNil)
45 c.Assert(uid, Equals, 101)45 c.Assert(uid, Equals, 101)
46}46}
@@ -51,7 +51,7 @@
51clickpkg:x:104:51clickpkg:x:104:
52`)52`)
5353
54 gid, err := readUid("clickpkg", f.Name())54 gid, err := readUID("clickpkg", f.Name())
55 c.Assert(err, IsNil)55 c.Assert(err, IsNil)
56 c.Assert(gid, Equals, 104)56 c.Assert(gid, Equals, 104)
57}57}
@@ -64,7 +64,7 @@
64`)64`)
65 defer os.Remove(f.Name())65 defer os.Remove(f.Name())
6666
67 uid, err := readUid("clickpkg", f.Name())67 uid, err := readUID("clickpkg", f.Name())
68 c.Assert(err, IsNil)68 c.Assert(err, IsNil)
69 c.Assert(uid, Equals, 102)69 c.Assert(uid, Equals, 102)
70}70}
@@ -75,7 +75,7 @@
75clickpkg:x:75clickpkg:x:
76`)76`)
7777
78 _, err := readUid("clickpkg", f.Name())78 _, err := readUID("clickpkg", f.Name())
79 c.Assert(err, NotNil)79 c.Assert(err, NotNil)
80}80}
8181
@@ -84,6 +84,6 @@
84daemon:84daemon:
85`)85`)
8686
87 _, err := readUid("clickpkg", f.Name())87 _, err := readUID("clickpkg", f.Name())
88 c.Assert(err, NotNil)88 c.Assert(err, NotNil)
89}89}
9090
=== modified file 'helpers/touch.go'
--- helpers/touch.go 2015-04-13 17:00:53 +0000
+++ helpers/touch.go 2015-07-06 18:51:26 +0000
@@ -36,6 +36,8 @@
36 "unsafe"36 "unsafe"
37)37)
3838
39// ErrNotAbsPath is returned when an absolute path is needed but the received
40// path is not.
39var ErrNotAbsPath = errors.New("not an absolute path")41var ErrNotAbsPath = errors.New("not an absolute path")
4042
41// UpdateTimestamp updates the timestamp of the file at pathname. It does not43// UpdateTimestamp updates the timestamp of the file at pathname. It does not

Subscribers

People subscribed via source and target branches