From 12cc95e5413a0ba34e41080dc5bb53470bc4bdc7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 2 Oct 2025 17:31:23 +0000 Subject: [PATCH] dnm: Vendor changes from containers/container-libs#354 --- go.mod | 6 ++++++ go.sum | 12 ++++++------ .../go.podman.io/storage/internal/tempdir/tempdir.go | 5 +++-- vendor/modules.txt | 9 ++++++--- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index b7bc53c30..d37539931 100644 --- a/go.mod +++ b/go.mod @@ -137,3 +137,9 @@ require ( sigs.k8s.io/yaml v1.6.0 // indirect tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect ) + +replace go.podman.io/common => github.com/DtxdF/container-libs/common v0.0.0-20251002172045-f87ef643019b + +replace go.podman.io/storage => github.com/DtxdF/container-libs/storage v0.0.0-20251002172045-f87ef643019b + +replace go.podman.io/image/v5 => github.com/DtxdF/container-libs/image/v5 v5.0.0-20251002172045-f87ef643019b diff --git a/go.sum b/go.sum index 49c62ecd2..5f4996084 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,12 @@ github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEK github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/DtxdF/container-libs/common v0.0.0-20251002172045-f87ef643019b h1:w1BtffxL5bd835FVdvYDlEg78jbGLHjxoo+FHlhaKQ0= +github.com/DtxdF/container-libs/common v0.0.0-20251002172045-f87ef643019b/go.mod h1:DyOdwtkwzYA8lE0TueJnxRju4Lmsrx6ZAC/ATAkYYck= +github.com/DtxdF/container-libs/image/v5 v5.0.0-20251002172045-f87ef643019b h1:vVg4k6aO1gyEEVTr+qvAy/J0XEb6SQk2bDy0Y3wZ8aQ= +github.com/DtxdF/container-libs/image/v5 v5.0.0-20251002172045-f87ef643019b/go.mod h1:cGWb3IyBziJGxhFikTOlt9Ap+zo6s3rz9Qd1rbzqs4s= +github.com/DtxdF/container-libs/storage v0.0.0-20251002172045-f87ef643019b h1:RguVfRxLROAEG74jHqqqLYF44jHhqLLio7PPVv4Emxo= +github.com/DtxdF/container-libs/storage v0.0.0-20251002172045-f87ef643019b/go.mod h1:AeZXAN8Qu1gTlAEHIc6mVhxk+61oMSM3K3iLx5UAQWE= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= @@ -317,12 +323,6 @@ go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKr go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= -go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4 h1:YjBqTOxz4cqfpifcd71VoBl1FTQL2U2La5NgMqmRRqU= -go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4/go.mod h1:DyOdwtkwzYA8lE0TueJnxRju4Lmsrx6ZAC/ATAkYYck= -go.podman.io/image/v5 v5.37.1-0.20250916163606-92222dcd3da4 h1:hfc3lZaxi6KGnWN3IusIaCkcMPR4rTR+vWZzakeD1EA= -go.podman.io/image/v5 v5.37.1-0.20250916163606-92222dcd3da4/go.mod h1:cGWb3IyBziJGxhFikTOlt9Ap+zo6s3rz9Qd1rbzqs4s= -go.podman.io/storage v1.60.1-0.20250916163606-92222dcd3da4 h1:jo0PSKh6muU7rmhXXqOV9aK+HrA8koqs47KhBsZf6LY= -go.podman.io/storage v1.60.1-0.20250916163606-92222dcd3da4/go.mod h1:AeZXAN8Qu1gTlAEHIc6mVhxk+61oMSM3K3iLx5UAQWE= go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs= go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8= go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= diff --git a/vendor/go.podman.io/storage/internal/tempdir/tempdir.go b/vendor/go.podman.io/storage/internal/tempdir/tempdir.go index 666742c5a..6522c45d1 100644 --- a/vendor/go.podman.io/storage/internal/tempdir/tempdir.go +++ b/vendor/go.podman.io/storage/internal/tempdir/tempdir.go @@ -10,6 +10,7 @@ import ( "github.com/sirupsen/logrus" "go.podman.io/storage/internal/staging_lockfile" + "go.podman.io/storage/pkg/system" ) /* @@ -148,7 +149,7 @@ func RecoverStaleDirs(rootDir string) error { continue } - if rmErr := os.RemoveAll(tempDirPath); rmErr != nil { + if rmErr := system.EnsureRemoveAll(tempDirPath); rmErr != nil { recoveryErrors = append(recoveryErrors, fmt.Errorf("error removing stale temp dir: %w", rmErr)) } if unlockErr := instanceLock.UnlockAndDelete(); unlockErr != nil { @@ -218,7 +219,7 @@ func (td *TempDir) Cleanup() error { return nil } - if err := os.RemoveAll(td.tempDirPath); err != nil { + if err := system.EnsureRemoveAll(td.tempDirPath); err != nil { return fmt.Errorf("removing temp dir failed: %w", err) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 9cc949de8..33449a822 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -464,7 +464,7 @@ go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded go.opentelemetry.io/otel/trace/internal/telemetry go.opentelemetry.io/otel/trace/noop -# go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4 +# go.podman.io/common v0.65.1-0.20250916163606-92222dcd3da4 => github.com/DtxdF/container-libs/common v0.0.0-20251002172045-f87ef643019b ## explicit; go 1.24.2 go.podman.io/common/internal go.podman.io/common/internal/attributedstring @@ -518,7 +518,7 @@ go.podman.io/common/pkg/umask go.podman.io/common/pkg/util go.podman.io/common/pkg/version go.podman.io/common/version -# go.podman.io/image/v5 v5.37.1-0.20250916163606-92222dcd3da4 +# go.podman.io/image/v5 v5.37.1-0.20250916163606-92222dcd3da4 => github.com/DtxdF/container-libs/image/v5 v5.0.0-20251002172045-f87ef643019b ## explicit; go 1.24.0 go.podman.io/image/v5/copy go.podman.io/image/v5/directory @@ -586,7 +586,7 @@ go.podman.io/image/v5/transports go.podman.io/image/v5/transports/alltransports go.podman.io/image/v5/types go.podman.io/image/v5/version -# go.podman.io/storage v1.60.1-0.20250916163606-92222dcd3da4 +# go.podman.io/storage v1.60.1-0.20250916163606-92222dcd3da4 => github.com/DtxdF/container-libs/storage v0.0.0-20251002172045-f87ef643019b ## explicit; go 1.24.0 go.podman.io/storage go.podman.io/storage/drivers @@ -826,3 +826,6 @@ tags.cncf.io/container-device-interface/pkg/parser # tags.cncf.io/container-device-interface/specs-go v1.0.0 ## explicit; go 1.19 tags.cncf.io/container-device-interface/specs-go +# go.podman.io/common => github.com/DtxdF/container-libs/common v0.0.0-20251002172045-f87ef643019b +# go.podman.io/storage => github.com/DtxdF/container-libs/storage v0.0.0-20251002172045-f87ef643019b +# go.podman.io/image/v5 => github.com/DtxdF/container-libs/image/v5 v5.0.0-20251002172045-f87ef643019b