Reuse blacklisting code in exp_archive.

client/archiver/directory.go

 // Copyright 2015 The LUCI Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 56 matching lines @@
                 if err != nil {
                         return fmt.Errorf("walk(%q): %v", path, err)
                 }
 
                 relPath, err := fsView.RelativePath(path)
                 if err != nil {
                         return fmt.Errorf("walk(%q): %v", path, err)
                 }
 
                 if relPath == "" { // empty string indicates skip.
-                        return returnSkip(info)
+                        return common.WalkFuncSkipFile(info)
                 }
 
                 if !info.IsDir() {
                         c <- &walkItem{fullPath: path, relPath: relPath, info: info}
                 }
                 return nil
         })
 
         if err != nil {
                 // No point continuing if an error occurred during walk.
                 log.Fatalf("Unable to walk %q: %v", root, err)
         }
 
 }
 
-// returnSkip returns the return value expected from a filepath.WalkFunc in the case where no more processing of file should occur.
-func returnSkip(file os.FileInfo) error {
-        if file.IsDir() {
-                // Must not return io.SkipDir for file, filepath.walk() handles this badly.
-                return filepath.SkipDir
-        }
-        return nil
-}
-
 // PushDirectory walks a directory at root and creates a .isolated file.
 //
 // It walks the directories synchronously, then returns a *Item to signal when
 // the background work is completed. The Item is signaled once all files are
 // hashed. In particular, the *Item is signaled before server side cache
 // lookups and upload is completed. Use archiver.Close() to wait for
 // completion.
 //
 // relDir is a relative directory to offset relative paths against in the
 // generated .isolated file.
@@ skipping 78 matching lines @@
                                         }
                                 }
                         }
                 }
                 if err != nil {
                         s.SetErr(err)
                 }
         }()
         return s
 }