Skip to content

Commit

Permalink
Fixed handling symlinks
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasdille committed Mar 7, 2024
1 parent 56db4ae commit 33c9843
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/archive/new.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func ExtractTarGz(gzipStream io.Reader, patchPath func(path string) string) erro
logging.Tracef("Untarring symlink %s", fixedHeaderName)

// Check if symlink already exists
_, err := os.Stat(fixedHeaderName)
_, err := os.Lstat(fixedHeaderName)
if err == nil {
logging.Debugf("Symlink %s already exists", fixedHeaderName)
}
Expand Down Expand Up @@ -159,12 +159,12 @@ func ExtractTarGz(gzipStream io.Reader, patchPath func(path string) string) erro
return fmt.Errorf("ExtractTarGz: MkdirAll() failed: %s", err.Error())
}

_, err = os.Lstat(header.Linkname)
_, err = os.Stat(header.Linkname)
if err != nil {
if os.IsNotExist(err) {
// Symlink target does not exist
} else {
return fmt.Errorf("ExtractTarGz: Lstat() failed for TypeSymlink: %s", err.Error())
return fmt.Errorf("ExtractTarGz: Stat() failed for TypeSymlink: %s", err.Error())
}
} else {
err = os.Remove(header.Linkname)
Expand Down

0 comments on commit 33c9843

Please sign in to comment.