From c565a3a1fe03a65eafbf126ee44302a6a3ed0eda Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 16 Jun 2024 13:51:40 +0200 Subject: [PATCH] pkg/archive: collectFileInfo: don't create FileInfo if unused The system.Lstat may fail, in which case it would be discarded, so let's move it later. Signed-off-by: Sebastiaan van Stijn --- pkg/archive/changes_other.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/archive/changes_other.go b/pkg/archive/changes_other.go index 13a7d3c0c6..36ddcd0dd5 100644 --- a/pkg/archive/changes_other.go +++ b/pkg/archive/changes_other.go @@ -72,17 +72,17 @@ func collectFileInfo(sourceDir string) (*FileInfo, error) { return fmt.Errorf("collectFileInfo: Unexpectedly no parent for %s", relPath) } - info := &FileInfo{ - name: filepath.Base(relPath), - children: make(map[string]*FileInfo), - parent: parent, - } - s, err := system.Lstat(path) if err != nil { return err } - info.stat = s + + info := &FileInfo{ + name: filepath.Base(relPath), + children: make(map[string]*FileInfo), + parent: parent, + stat: s, + } info.capability, _ = system.Lgetxattr(path, "security.capability")