local repo goes first
remove the old function local repo goes first exit on err passToPacman()
This commit is contained in:
1 parent
b1e01b3af5
commit
8c1d64c06b
2 files changed
+5
-36
No files matched your search
@@ -195,30 +195,3 @@ func continueTask(s string, def string) (cont bool) {
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
// PassToPacman outsorces execution to pacman binary without modifications.
|
||||
func passToPacman(op string, pkgs []string, flags []string) error {
|
||||
var cmd *exec.Cmd
|
||||
var args []string
|
||||
|
||||
args = append(args, op)
|
||||
if len(pkgs) != 0 {
|
||||
args = append(args, pkgs...)
|
||||
}
|
||||
|
||||
if len(flags) != 0 {
|
||||
args = append(args, flags...)
|
||||
}
|
||||
|
||||
if strings.Contains(op, "-Q") || op == "-Si" {
|
||||
cmd = exec.Command(config.PacmanBin, args...)
|
||||
} else {
|
||||
args = append([]string{config.PacmanBin}, args...)
|
||||
cmd = exec.Command("sudo", args...)
|
||||
}
|
||||
|
||||
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
||||
err := cmd.Run()
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -160,7 +160,11 @@ func syncInfo(pkgS []string, flags []string) (err error) {
|
||||
|
||||
//repo always goes first
|
||||
if len(repoS) != 0 {
|
||||
err = passToPacman("-Si", repoS, flags)
|
||||
arguments := makeArguments()
|
||||
arguments.addArg("S", "i")
|
||||
//arguments.addArg(flags...)
|
||||
arguments.addTarget(repoS...)
|
||||
err = passToPacman(arguments)
|
||||
|
||||
if err != nil {
|
||||
return
|
||||
@@ -177,14 +181,6 @@ func syncInfo(pkgS []string, flags []string) (err error) {
|
||||
}
|
||||
}
|
||||
|
||||
if len(repoS) != 0 {
|
||||
arguments := makeArguments()
|
||||
arguments.addArg("S", "i")
|
||||
//arguments.addArg(flags...)
|
||||
arguments.addTarget(repoS...)
|
||||
err = passToPacman(arguments)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user