1
0
mirror of https://github.com/lxc/distrobuilder.git synced 2026-02-05 06:45:19 +01:00

Merge pull request #670 from monstermunchkin/sources/yum

managers/yum: Use --nobest only if available
This commit is contained in:
Stéphane Graber
2022-09-21 10:51:52 -04:00
committed by GitHub

View File

@@ -18,20 +18,6 @@ type yum struct {
}
func (m *yum) load() error {
var buf bytes.Buffer
globalFlags := []string{"-y"}
shared.RunCommand(m.ctx, nil, &buf, "yum", "--help")
scanner := bufio.NewScanner(&buf)
for scanner.Scan() {
if strings.Contains(scanner.Text(), "--allowerasing") {
globalFlags = append(globalFlags, "--allowerasing")
break
}
}
m.commands = managerCommands{
clean: "yum",
install: "yum",
@@ -44,7 +30,9 @@ func (m *yum) load() error {
clean: []string{
"clean", "all",
},
global: globalFlags,
global: []string{
"-y",
},
install: []string{
"install",
},
@@ -56,10 +44,26 @@ func (m *yum) load() error {
},
update: []string{
"update",
"--nobest",
},
}
var buf bytes.Buffer
shared.RunCommand(m.ctx, nil, &buf, "yum", "--help")
scanner := bufio.NewScanner(&buf)
for scanner.Scan() {
if strings.Contains(scanner.Text(), "--allowerasing") {
m.flags.global = append(m.flags.global, "--allowerasing")
continue
}
if strings.Contains(scanner.Text(), "--nobest") {
m.flags.update = append(m.flags.update, "--nobest")
}
}
return nil
}