Merge lp:~chipaca/snappy/use-skipdir into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

use filepath.SkipDir in writeHashes

[Sergio Schvezov (sergiusens)]

looks dandy

review: Approve

[Michael Vogt (mvo)]

LGTM, one question/comment inline.

review: Approve

=== modified file 'snappy/build.go'
--- snappy/build.go	2015-05-15 13:33:27 +0000
+++ snappy/build.go	2015-05-28 11:35:06 +0000
@@ -268,10 +268,12 @@
 	hashes.ArchiveSha512 = sha512
 
 	err = filepath.Walk(buildDir, func(path string, info os.FileInfo, err error) error {
-		if strings.HasPrefix(path[len(buildDir):], "/DEBIAN") {
-			return nil
+		// path will always start with buildDir...
+		if path[len(buildDir):] == "/DEBIAN" {
+			return filepath.SkipDir
 		}
-		if path == buildDir {
+		// ...so if path's length is == buildDir, it's buildDir
+		if len(path) == len(buildDir) {
 			return nil
 		}