diff options
| author | Bao Trinh <github@baodtrinh.com> | 2021-01-12 10:47:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 11:47:37 -0500 |
| commit | 2b2c7f391140cdf268a62ddca0c40bc2e01017ea (patch) | |
| tree | c034e8e305b445100d14acf061c27b01419d66be | |
| parent | 2bfa461b01b14fb9fac1a3c6bee400bb4e549f81 (diff) | |
| download | vyos-cloud-init-2b2c7f391140cdf268a62ddca0c40bc2e01017ea.tar.gz vyos-cloud-init-2b2c7f391140cdf268a62ddca0c40bc2e01017ea.zip | |
archlinux: fix package upgrade command handling (#768)
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
Co-authored-by: Rick Harding <rharding@mitechie.com>
| -rw-r--r-- | cloudinit/distros/arch.py | 2 | ||||
| -rw-r--r-- | tools/.github-cla-signers | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index 967be168..378a6daa 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -152,6 +152,8 @@ class Distro(distros.Distro): 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 d6ca6d1b..e6e3bdd1 100644 --- a/tools/.github-cla-signers +++ b/tools/.github-cla-signers @@ -26,6 +26,7 @@ nishigori olivierlemasle omBratteng onitake +qubidt riedel slyon smoser |