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

Merge pull request #27236 from Honny1/fix-arg

Browse Source 
quadlet: standardize Convert function signatures
This commit is contained in:
openshift-merge-bot[bot]
2025-10-06 17:48:47 +00:00
committed by GitHub
parent 80b20c7614 98cb7b75d9
commit 7f6bd39ce0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/quadlet/main.go
View File

@ -537,7 +537,7 @@ func process() bool {
switch {
case strings.HasSuffix(unit.Filename, ".container"):
warnIfAmbiguousName(unit, quadlet.ContainerGroup)
service, warnings, err = quadlet.ConvertContainer(unit, isUserFlag, unitsInfoMap)
service, warnings, err = quadlet.ConvertContainer(unit, unitsInfoMap, isUserFlag)
case strings.HasSuffix(unit.Filename, ".volume"):
warnIfAmbiguousName(unit, quadlet.VolumeGroup)
service, warnings, err = quadlet.ConvertVolume(unit, unitsInfoMap, isUserFlag)
@ -551,7 +551,7 @@ func process() bool {
case strings.HasSuffix(unit.Filename, ".build"):
service, warnings, err = quadlet.ConvertBuild(unit, unitsInfoMap, isUserFlag)
case strings.HasSuffix(unit.Filename, ".pod"):
service, warnings, err = quadlet.ConvertPod(unit, unit.Filename, unitsInfoMap, isUserFlag)
service, warnings, err = quadlet.ConvertPod(unit, unitsInfoMap, isUserFlag)
default:
Logf("Unsupported file type %q", unit.Filename)
continue

4
pkg/systemd/quadlet/quadlet.go
View File

@ -562,7 +562,7 @@ func usernsOpts(kind string, opts []string) string {
// service file (unit file with Service group) based on the options in the
// Container group.
// The original Container group is kept around as X-Container.
func ConvertContainer(container *parser.UnitFile, isUser bool, unitsInfoMap map[string]*UnitInfo) (*parser.UnitFile, error, error) {
func ConvertContainer(container *parser.UnitFile, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) {
var warn, warnings error
service, _, err := initServiceUnitFile(container, isUser, unitsInfoMap, ContainerGroup)
@ -1527,7 +1527,7 @@ func GetPodResourceName(podUnit *parser.UnitFile) string {
return podName
}
func ConvertPod(podUnit *parser.UnitFile, _ string, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) {
func ConvertPod(podUnit *parser.UnitFile, unitsInfoMap map[string]*UnitInfo, isUser bool) (*parser.UnitFile, error, error) {
var warn, warnings error
service, unitInfo, err := initServiceUnitFile(podUnit, isUser, unitsInfoMap, PodGroup)