From 58c614d426e66d0ae1c637550de66f9d793fec14 Mon Sep 17 00:00:00 2001 From: Bao Trinh Date: Mon, 11 Jan 2021 18:01:25 -0600 Subject: [PATCH] archlinux: fix package upgrade command handling pacman uses `-u` instead of `upgrade` to trigger a system upgrade, fix the command handling so this is properly accounted for. as is, the resulting command attempts to install a (non-existent) `upgrade` package --- cloudinit/distros/arch.py | 2 ++ tools/.github-cla-signers | 1 + 2 files changed, 3 insertions(+) diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index 967be168dbc..378a6daa9c6 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -152,6 +152,8 @@ def package_command(self, command, args=None, pkgs=None): elif args and isinstance(args, list): cmd.extend(args) + if command == "upgrade": + command = "-u" if command: cmd.append(command) diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers index d6ca6d1bc6d..e6e3bdd111c 100644 --- a/tools/.github-cla-signers +++ b/tools/.github-cla-signers @@ -26,6 +26,7 @@ nishigori olivierlemasle omBratteng onitake +qubidt riedel slyon smoser