Merge lp:~elopio/snappy/fix1468846-lint into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

Fixed lint errors.

[Sergio Schvezov (sergiusens)]

looks good. Let's see if tarmac likes it ;-)

review: Approve

[Sergio Schvezov (sergiusens)]

strange that helpers/touch.go was not errored on before though

=== modified file 'cmd/snappy/cmd_internal_unpack.go'
--- cmd/snappy/cmd_internal_unpack.go	2015-06-08 13:03:35 +0000
+++ cmd/snappy/cmd_internal_unpack.go	2015-06-25 17:56:21 +0000
@@ -70,7 +70,7 @@
 	return filepath.Join("/etc/", file)
 }
 
-func readUid(user, passwdFile string) (uid int, err error) {
+func readUID(user, passwdFile string) (uid int, err error) {
 	f, err := os.Open(passwdFile)
 	if err != nil {
 		return -1, err
@@ -125,13 +125,13 @@
 	if helpers.ShouldDropPrivs() {
 
 		passFile := passwdFile(rootDir, "passwd")
-		uid, err := readUid(dropPrivsUser, passFile)
+		uid, err := readUID(dropPrivsUser, passFile)
 		if err != nil {
 			return err
 		}
 
 		groupFile := passwdFile(rootDir, "group")
-		gid, err := readUid(dropPrivsUser, groupFile)
+		gid, err := readUID(dropPrivsUser, groupFile)
 		if err != nil {
 			return err
 		}

=== modified file 'cmd/snappy/cmd_low_level_unpack_test.go'
--- cmd/snappy/cmd_low_level_unpack_test.go	2015-06-02 20:46:07 +0000
+++ cmd/snappy/cmd_low_level_unpack_test.go	2015-06-25 17:56:21 +0000
@@ -42,7 +42,7 @@
 clickpkg:x:101:104::/nonexistent:/bin/false
 `)
 
-	uid, err := readUid("clickpkg", f.Name())
+	uid, err := readUID("clickpkg", f.Name())
 	c.Assert(err, IsNil)
 	c.Assert(uid, Equals, 101)
 }
@@ -53,7 +53,7 @@
 clickpkg:x:104:
 `)
 
-	gid, err := readUid("clickpkg", f.Name())
+	gid, err := readUID("clickpkg", f.Name())
 	c.Assert(err, IsNil)
 	c.Assert(gid, Equals, 104)
 }
@@ -66,7 +66,7 @@
 `)
 	defer os.Remove(f.Name())
 
-	uid, err := readUid("clickpkg", f.Name())
+	uid, err := readUID("clickpkg", f.Name())
 	c.Assert(err, IsNil)
 	c.Assert(uid, Equals, 102)
 }
@@ -77,7 +77,7 @@
 clickpkg:x:
 `)
 
-	_, err := readUid("clickpkg", f.Name())
+	_, err := readUID("clickpkg", f.Name())
 	c.Assert(err, NotNil)
 }
 
@@ -86,6 +86,6 @@
 daemon:
 `)
 
-	_, err := readUid("clickpkg", f.Name())
+	_, err := readUID("clickpkg", f.Name())
 	c.Assert(err, NotNil)
 }

=== modified file 'helpers/touch.go'
--- helpers/touch.go	2015-05-15 13:33:27 +0000
+++ helpers/touch.go	2015-06-25 17:56:21 +0000
@@ -38,6 +38,8 @@
 	"unsafe"
 )
 
+// ErrNotAbsPath is returned when an absolute path is needed but the received
+// path is not.
 var ErrNotAbsPath = errors.New("not an absolute path")
 
 // UpdateTimestamp updates the timestamp of the file at pathname. It does not