Cleanup, fix issue with package being removed after being updated with the same ver
Some checks failed
the build failed

This commit is contained in:
Tyler
2018-10-14 04:35:50 -04:00
parent face5e5029
commit b0e3d80022
7 changed files with 44 additions and 131 deletions

View File

@ -1,15 +1,15 @@
package archive
import (
"os"
"archive/tar"
"bytes"
"compress/gzip"
"fmt"
"github.com/blakesmith/ar"
"bytes"
"io"
"strings"
"compress/gzip"
"archive/tar"
"log"
"os"
"strings"
)
func InspectPackage(filename string) (string, error) {
@ -21,7 +21,6 @@ func InspectPackage(filename string) (string, error) {
arReader := ar.NewReader(f)
defer f.Close()
var controlBuf bytes.Buffer
for {
header, err := arReader.Next()
@ -35,15 +34,14 @@ func InspectPackage(filename string) (string, error) {
}
if strings.Trim(header.Name, "/") == "control.tar.gz" {
io.Copy(&controlBuf, arReader)
return InspectPackageControl(controlBuf)
return InspectPackageControl(arReader)
}
}
return "", nil
}
func InspectPackageControl(filename bytes.Buffer) (string, error) {
gzf, err := gzip.NewReader(bytes.NewReader(filename.Bytes()))
func InspectPackageControl(reader io.Reader) (string, error) {
gzf, err := gzip.NewReader(reader)
if err != nil {
return "", fmt.Errorf("error creating gzip reader: %s", err)
}