Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spec archives one zip file twice (#1068)

Browse Source
This commit is contained in:
Vishal
2019-01-22 00:07:57 +08:00
committed by Ta-Ching Chen
parent 2efa255eb4
commit 68a511184f
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fission/spec.go
+10 -9
View File
@@ -975,16 +975,17 @@ func localArchiveFromSpec(specDir string, aus *ArchiveUploadSpec) (*fission.Arch
files := make([]string, 0) files := make([]string, 0)
if len(aus.IncludeGlobs) == 1 && archiver.Zip.Match(aus.IncludeGlobs[0]) { if len(aus.IncludeGlobs) == 1 && archiver.Zip.Match(aus.IncludeGlobs[0]) {
files = append(files, aus.IncludeGlobs[0]) files = append(files, aus.IncludeGlobs[0])
} } else {
for _, relativeGlob := range aus.IncludeGlobs { for _, relativeGlob := range aus.IncludeGlobs {
absGlob := rootDir + "/" + relativeGlob absGlob := rootDir + "/" + relativeGlob
f, err := filepath.Glob(absGlob) f, err := filepath.Glob(absGlob)
if err != nil { if err != nil {
log.Info(fmt.Sprintf("Invalid glob in archive %v: %v", aus.Name, relativeGlob)) log.Info(fmt.Sprintf("Invalid glob in archive %v: %v", aus.Name, relativeGlob))
return nil, err return nil, err
}
files = append(files, f...)
// xxx handle excludeGlobs here
} }
files = append(files, f...)
// xxx handle excludeGlobs here
} }
if len(files) == 0 { if len(files) == 0 {