Skip to content

Grab last remaining Gentoo patches (SC-919) #1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheRealFalcon merged 1 commit into from
Apr 11, 2022
Merged

Grab last remaining Gentoo patches (SC-919) #1372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions cloudinit/distros/gentoo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,23 +218,26 @@ def set_timezone(self, tz):
distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))

def package_command(self, command, args=None, pkgs=None):
if pkgs is None:
pkgs = []

cmd = list("emerge")
# Redirect output
cmd.append("--quiet")

if args and isinstance(args, str):
cmd.append(args)
elif args and isinstance(args, list):
cmd.extend(args)
if command == "upgrade":
cmd.extend(["--update", "world"])
else:
if pkgs is None:
pkgs = []

if args and isinstance(args, str):
cmd.append(args)
elif args and isinstance(args, list):
cmd.extend(args)

if command:
cmd.append(command)
if command:
cmd.append(command)

pkglist = util.expand_package_list("%s-%s", pkgs)
cmd.extend(pkglist)
pkglist = util.expand_package_list("%s-%s", pkgs)
cmd.extend(pkglist)

# Allow the output of this to flow outwards (ie not be captured)
subp.subp(cmd, capture=False)
Expand All @@ -243,7 +246,7 @@ def update_package_sources(self):
self._runner.run(
"update-sources",
self.package_command,
["-u", "world"],
["--sync"],
freq=PER_INSTANCE,
)

Expand Down