aboutsummaryrefslogtreecommitdiffstats
path: root/client/go/internal/vespa/application.go
diff options
context:
space:
mode:
authorEirik Nygaard <eirik.nygaard@yahooinc.com>2023-09-12 13:31:17 +0200
committerEirik Nygaard <eirik.nygaard@yahooinc.com>2023-09-12 13:34:20 +0200
commit65d458fccb238c7a31c240be681efd2f13fa7969 (patch)
treec79b5c31246a72119d67196bb589de532011acc4 /client/go/internal/vespa/application.go
parent51afae225c48d422fbfe9e70746f32c0b1deac0a (diff)
Skip any .DS_Store directories when ziping application package
Diffstat (limited to 'client/go/internal/vespa/application.go')
-rw-r--r--client/go/internal/vespa/application.go14
1 files changed, 14 insertions, 0 deletions
diff --git a/client/go/internal/vespa/application.go b/client/go/internal/vespa/application.go
index dd1b580517b..29ae0c4b959 100644
--- a/client/go/internal/vespa/application.go
+++ b/client/go/internal/vespa/application.go
@@ -96,6 +96,12 @@ func zipDir(dir string, destination string) error {
if err != nil {
return err
}
+ if ignorePackageFile(filepath.Base(path)) {
+ if info.IsDir() {
+ return filepath.SkipDir
+ }
+ return nil
+ }
if info.IsDir() {
return nil
}
@@ -123,6 +129,14 @@ func zipDir(dir string, destination string) error {
return filepath.Walk(dir, walker)
}
+func ignorePackageFile(name string) bool {
+ switch name {
+ case ".DS_Store":
+ return true
+ }
+ return false
+}
+
func (ap *ApplicationPackage) zipReader(test bool) (io.ReadCloser, error) {
zipFile := ap.Path
if test {