Use a patched archiver

cloudfoundry-incubator · Nov 22, 2018 · f11b26d · f11b26d
1 parent ec9f445
commit f11b26d
Show file tree

Hide file tree

Showing 22 changed files with 777 additions and 2,655 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -75,7 +75,7 @@
 
 [[constraint]]
   name = "github.com/mholt/archiver"
-  version = "3.1.0"
+  version = "2.1.0"
 
 [[constraint]]
   name = "github.com/pborman/uuid"

diff --git a/compilator/storage.go b/compilator/storage.go
@@ -191,9 +191,8 @@ func (p *PackageStorage) Download(pack *model.Package, progressEvent DownloadPro
 	}
 
 	// Unpack the compiled contents
-	err = archiver.DefaultTar.Extract(
+	err = archiver.Tar.Open(
 		path,
-		"",
 		filepath.Join(p.CompilationWorkDir, pack.Fingerprint),
 	)
 
@@ -210,7 +209,7 @@ func (p *PackageStorage) Upload(pack *model.Package) error {
 	}
 
 	// Archive (tar) the contents
-	err = archiver.DefaultTar.Archive([]string{pack.GetPackageCompiledDir(p.CompilationWorkDir)}, archiveName)
+	err = archiver.Tar.Make(archiveName, []string{pack.GetPackageCompiledDir(p.CompilationWorkDir)})
 	// Cleanup the archive when done
 	defer os.RemoveAll(archiveName)
 

diff --git a/model/roles.go b/model/roles.go
@@ -216,7 +216,7 @@ func (m *RoleManifest) loadReleaseReferences() ([]*Release, error) {
 				}()
 
 				// unpack
-				err = archiver.DefaultTarGz.Extract(finalReleaseTarballPath, "", finalReleaseUnpackedPath)
+				err = archiver.TarGz.Open(finalReleaseTarballPath, finalReleaseUnpackedPath)
 				if err != nil {
 					allErrs = multierror.Append(allErrs, err)
 					return

diff --git a/vendor/github.com/mholt/archiver/README.md b/vendor/github.com/mholt/archiver/README.md
diff --git a/vendor/github.com/mholt/archiver/appveyor.yml b/vendor/github.com/mholt/archiver/appveyor.yml