Merge lp:~sergiusens/snappy/go1.5 into lp:~snappy-dev/snappy/snappy-moved-to-github

[Sergio Schvezov]

Workaround and/or fix go 1.5 issues

Unmerged revisions

626. By Sergio Schvezov on 2015-07-31

New go vet issue (missing return for fmt.Errorf)

625. By Sergio Schvezov on 2015-07-31

hardlinks tar'ed up as regular files explicitly.

=== modified file 'clickdeb/deb.go'
--- clickdeb/deb.go	2015-05-28 14:48:08 +0000
+++ clickdeb/deb.go	2015-07-31 13:40:21 +0000
@@ -335,6 +335,14 @@
 			return err
 		}
 
+		// FIXME: our current implementation does not tar hard links correctly
+		// and just duplicates the contents, this is just a workaround for
+		// go 1.5
+		if hdr.Typeflag == tar.TypeLink {
+			hdr.Typeflag = tar.TypeReg
+			hdr.Size = info.Size()
+		}
+
 		// tar.FileInfoHeader does include the fact that its a
 		// char/block device, but does not set major/minor :/
 		if helpers.IsDevice(st.Mode()) {
 
=== modified file 'helpers/helpers.go'
--- helpers/helpers.go	2015-07-01 21:09:59 +0000
+++ helpers/helpers.go	2015-07-31 13:40:21 +0000
@@ -490,7 +490,7 @@
 			//      of atime/mtime and permissions
 			output, err := exec.Command("cp", "-va", src, dst).CombinedOutput()
 			if err != nil {
-				fmt.Errorf("Failed to copy %s to %s (%s)", src, dst, output)
+				return fmt.Errorf("Failed to copy %s to %s (%s)", src, dst, output)
 			}
 		}
 		return nil