sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-10-04 00:03:11 -04:00
Code Issues Projects Releases Wiki Activity

local repo goes first

Browse Source 
remove the old function

local repo goes first

exit on err passToPacman()
This commit is contained in:
l4 2018-01-15 22:30:29 +07:00 committed by l4
parent b1e01b3af5
commit 8c1d64c06b
2 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
config.go
View File

@ -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
}
}

14
query.go
View File

@ -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
}