kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-17 07:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat CompressionType none as default

Browse Source 
To provide backward compatibility with repos that didn't declares it explictly
This commit is contained in:
Ettore Di Giacinto
2019-12-31 12:29:53 +01:00
parent c193e4d320
commit efdfe72568
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/compiler/artifact.go
View File

@@ -199,9 +199,6 @@ func (a *PackageArtifact) SetPath(p string) {
// Compress Archives and compress (TODO) to the artifact path // Compress Archives and compress (TODO) to the artifact path
func (a *PackageArtifact) Compress(src string, concurrency int) error { func (a *PackageArtifact) Compress(src string, concurrency int) error {
switch a.CompressionType { switch a.CompressionType {
case None:
return helpers.Tar(src, a.Path)
case GZip: case GZip:
err := helpers.Tar(src, a.Path) err := helpers.Tar(src, a.Path)
if err != nil { if err != nil {
@@ -236,6 +233,11 @@ func (a *PackageArtifact) Compress(src string, concurrency int) error {
a.Path = gzipfile a.Path = gzipfile
return nil return nil
//a.Path = gzipfile //a.Path = gzipfile
// Defaults to tar only (covers when "none" is supplied)
default:
return helpers.Tar(src, a.Path)
} }
return errors.New("Compression type must be supplied") return errors.New("Compression type must be supplied")
} }
@@ -243,9 +245,6 @@ func (a *PackageArtifact) Compress(src string, concurrency int) error {
// Unpack Untar and decompress (TODO) to the given path // Unpack Untar and decompress (TODO) to the given path
func (a *PackageArtifact) Unpack(dst string, keepPerms bool) error { func (a *PackageArtifact) Unpack(dst string, keepPerms bool) error {
switch a.CompressionType { switch a.CompressionType {
case None:
return helpers.Untar(a.GetPath(), dst, keepPerms)
case GZip: case GZip:
// Create the uncompressed archive // Create the uncompressed archive
archive, err := os.Create(a.GetPath() + ".uncompressed") archive, err := os.Create(a.GetPath() + ".uncompressed")
@@ -278,7 +277,9 @@ func (a *PackageArtifact) Unpack(dst string, keepPerms bool) error {
return err return err
} }
return nil return nil
// Defaults to tar only (covers when "none" is supplied)
default:
return helpers.Untar(a.GetPath(), dst, keepPerms)
} }
return errors.New("Compression type must be supplied") return errors.New("Compression type must be supplied")
} }
@@ -286,15 +287,6 @@ func (a *PackageArtifact) Unpack(dst string, keepPerms bool) error {
func (a *PackageArtifact) FileList() ([]string, error) { func (a *PackageArtifact) FileList() ([]string, error) {
var tr *tar.Reader var tr *tar.Reader
switch a.CompressionType { switch a.CompressionType {
case None:
tarFile, err := os.Open(a.GetPath())
if err != nil {
return []string{}, errors.Wrap(err, "Could not open package archive")
}
defer tarFile.Close()
tr = tar.NewReader(tarFile)
case GZip: case GZip:
// Create the uncompressed archive // Create the uncompressed archive
archive, err := os.Create(a.GetPath() + ".uncompressed") archive, err := os.Create(a.GetPath() + ".uncompressed")
@@ -318,6 +310,15 @@ func (a *PackageArtifact) FileList() ([]string, error) {
defer r.Close() defer r.Close()
tr = tar.NewReader(r) tr = tar.NewReader(r)
// Defaults to tar only (covers when "none" is supplied)
default:
tarFile, err := os.Open(a.GetPath())
if err != nil {
return []string{}, errors.Wrap(err, "Could not open package archive")
}
defer tarFile.Close()
tr = tar.NewReader(tarFile)
} }
var files []string var files []string