opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-01 18:49:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update vendor or containers/buildah

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2022-09-22 05:54:49 -04:00
parent 25dc2759e1
commit 54653ceebe
181 changed files with 2108 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/github.com/containers/buildah/util.go generated vendored
View File

@@ -151,7 +151,7 @@ func ReserveSELinuxLabels(store storage.Store, id string) error {
if selinuxGetEnabled() {
containers, err := store.Containers()
if err != nil {
return fmt.Errorf("error getting list of containers: %w", err)
return fmt.Errorf("getting list of containers: %w", err)
}
for _, c := range containers {
@@ -169,7 +169,7 @@ func ReserveSELinuxLabels(store storage.Store, id string) error {
}
// Prevent different containers from using same MCS label
if err := label.ReserveLabel(b.ProcessLabel); err != nil {
return fmt.Errorf("error reserving SELinux label %q: %w", b.ProcessLabel, err)
return fmt.Errorf("reserving SELinux label %q: %w", b.ProcessLabel, err)
}
}
}
@@ -219,10 +219,10 @@ func extractWithTar(root, src, dest string) error {
wg.Wait()
if getErr != nil {
return fmt.Errorf("error reading %q: %w", src, getErr)
return fmt.Errorf("reading %q: %w", src, getErr)
}
if putErr != nil {
return fmt.Errorf("error copying contents of %q to %q: %w", src, dest, putErr)
return fmt.Errorf("copying contents of %q to %q: %w", src, dest, putErr)
}
return nil
}