From 43c52c69d2fec513aad33b082330a1665611ae34 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Tue, 3 Jul 2018 13:42:13 +0100 Subject: [PATCH] Also remove -u when not doing combined upgrade When not doing combined upgrade we do pacman -Syu early. So there is no need to use -u when installing repo dependencies of AUR packages. --- install.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install.go b/install.go index 492c4282..85bc02b8 100644 --- a/install.go +++ b/install.go @@ -160,6 +160,10 @@ func install(parser *arguments) error { } if len(dp.Aur) == 0 { + if !config.CombinedUpgrade { + return nil + } + parser.op = "S" parser.delArg("y", "refresh") parser.options["ignore"] = arguments.options["ignore"] @@ -294,6 +298,10 @@ func install(parser *arguments) error { } } + if !config.CombinedUpgrade { + arguments.delArg("u", "sysupgrade") + } + if len(arguments.targets) > 0 || arguments.existsArg("u") { err := passToPacman(arguments) if err != nil {