From 5bef39b728f678a6e9f19ad14f0b4a8cc6fed376 Mon Sep 17 00:00:00 2001 From: Benjamin Robin Date: Sun, 24 Jan 2021 20:31:46 +0100 Subject: [PATCH] Do not use CmdRunner.Capture() while executing a command with sudo Fix #1440 --- install.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install.go b/install.go index b1ba77c2..5bbdd7a2 100644 --- a/install.go +++ b/install.go @@ -29,33 +29,33 @@ import ( const gitEmptyTree = "4b825dc642cb6eb9a060e54bf8d69288fbee4904" -func asdeps(cmdArgs *settings.Arguments, pkgs []string) error { +func asdeps(cmdArgs *settings.Arguments, pkgs []string) (err error) { if len(pkgs) == 0 { return nil } cmdArgs = cmdArgs.CopyGlobal() - _ = cmdArgs.AddArg("D", "asdeps") + _ = cmdArgs.AddArg("q", "D", "asdeps") cmdArgs.AddTarget(pkgs...) - _, stderr, err := config.Runtime.CmdRunner.Capture(passToPacman(cmdArgs), 0) + err = config.Runtime.CmdRunner.Show(passToPacman(cmdArgs)) if err != nil { - return fmt.Errorf("%s %s", stderr, err) + return fmt.Errorf(gotext.Get("error updating package install reason to dependency")) } return nil } -func asexp(cmdArgs *settings.Arguments, pkgs []string) error { +func asexp(cmdArgs *settings.Arguments, pkgs []string) (err error) { if len(pkgs) == 0 { return nil } cmdArgs = cmdArgs.CopyGlobal() - _ = cmdArgs.AddArg("D", "asexplicit") + _ = cmdArgs.AddArg("q", "D", "asexplicit") cmdArgs.AddTarget(pkgs...) - _, stderr, err := config.Runtime.CmdRunner.Capture(passToPacman(cmdArgs), 0) + err = config.Runtime.CmdRunner.Show(passToPacman(cmdArgs)) if err != nil { - return fmt.Errorf("%s %s", stderr, err) + return fmt.Errorf(gotext.Get("error updating package install reason to explicit")) } return nil