Fix spec archives one zip file twice (#1068)
This commit is contained in:
+2
-1
@@ -975,7 +975,7 @@ func localArchiveFromSpec(specDir string, aus *ArchiveUploadSpec) (*fission.Arch
|
||||
files := make([]string, 0)
|
||||
if len(aus.IncludeGlobs) == 1 && archiver.Zip.Match(aus.IncludeGlobs[0]) {
|
||||
files = append(files, aus.IncludeGlobs[0])
|
||||
}
|
||||
} else {
|
||||
for _, relativeGlob := range aus.IncludeGlobs {
|
||||
absGlob := rootDir + "/" + relativeGlob
|
||||
f, err := filepath.Glob(absGlob)
|
||||
@@ -986,6 +986,7 @@ func localArchiveFromSpec(specDir string, aus *ArchiveUploadSpec) (*fission.Arch
|
||||
files = append(files, f...)
|
||||
// xxx handle excludeGlobs here
|
||||
}
|
||||
}
|
||||
|
||||
if len(files) == 0 {
|
||||
return nil, fmt.Errorf("Archive '%v' is empty", aus.Name)
|
||||
|
||||
Reference in New Issue
Block a user