Merge pull request #26472 from Luap99/quadlet-nologrus

openshift-merge-bot[bot] · web-flow · commit 7808625785b1 · 2025-06-19T19:45:24.000Z
quadlet: remove indirect logrus import
diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/containers/podman/v5/pkg/specgenutilexternal"
 	"github.com/containers/podman/v5/pkg/systemd/parser"
-	"github.com/containers/storage/pkg/fileutils"
 	"github.com/containers/storage/pkg/regexp"
 )
 
@@ -754,7 +753,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[
 	for _, device := range devices {
 		if device[0] == '-' {
 			device = device[1:]
-			err := fileutils.Exists(strings.Split(device, ":")[0])
+			_, err := os.Stat(strings.Split(device, ":")[0])
 			if errors.Is(err, os.ErrNotExist) {
 				continue
 			}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/containers/podman/v5/pkg/specgenutilexternal"`
`13`	`13`	`"github.com/containers/podman/v5/pkg/systemd/parser"`
`14`		`- "github.com/containers/storage/pkg/fileutils"`
`15`	`14`	`"github.com/containers/storage/pkg/regexp"`
`16`	`15`	`)`
`17`	`16`
`@@ -754,7 +753,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[`
`754`	`753`	`for _, device := range devices {`
`755`	`754`	`if device[0] == '-' {`
`756`	`755`	`device = device[1:]`
`757`		`- err := fileutils.Exists(strings.Split(device, ":")[0])`
	`756`	`+ _, err := os.Stat(strings.Split(device, ":")[0])`
`758`	`757`	`if errors.Is(err, os.ErrNotExist) {`
`759`	`758`	`continue`
`760`	`759`	`}`