sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-12-09 00:03:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #149 from BrianAllred/master

Browse Source 
Fix not passing enough args to pacman
This commit is contained in:
J Guerreiro 2018-02-15 08:49:34 +00:00 committed by GitHub
commit fb032c65b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd.go
View File

@ -455,7 +455,6 @@ func handleYogurt() (err error) {
func handleSync() (err error) { func handleSync() (err error) {
targets := cmdArgs.formatTargets() targets := cmdArgs.formatTargets()
options := cmdArgs.formatArgs()
if cmdArgs.existsArg("y", "refresh") { if cmdArgs.existsArg("y", "refresh") {
arguments := cmdArgs.copy() arguments := cmdArgs.copy()
@ -480,7 +479,7 @@ func handleSync() (err error) {
} else if cmdArgs.existsArg("u", "sysupgrade") { } else if cmdArgs.existsArg("u", "sysupgrade") {
err = upgradePkgs(make([]string, 0)) err = upgradePkgs(make([]string, 0))
} else if cmdArgs.existsArg("i", "info") { } else if cmdArgs.existsArg("i", "info") {
err = syncInfo(targets, options) err = syncInfo(targets)
} else if len(cmdArgs.targets) > 0 { } else if len(cmdArgs.targets) > 0 {
err = install(cmdArgs) err = install(cmdArgs)
} }

8
query.go
View File

@ -152,7 +152,7 @@ func syncSearch(pkgS []string) (err error) {
} }
// SyncInfo serves as a pacman -Si for repo packages and AUR packages. // SyncInfo serves as a pacman -Si for repo packages and AUR packages.
func syncInfo(pkgS []string, flags []string) (err error) { func syncInfo(pkgS []string) (err error) {
aurS, repoS, _, err := packageSlices(pkgS) aurS, repoS, _, err := packageSlices(pkgS)
if err != nil { if err != nil {
return return
@ -160,10 +160,8 @@ func syncInfo(pkgS []string, flags []string) (err error) {
//repo always goes first //repo always goes first
if len(repoS) != 0 { if len(repoS) != 0 {
arguments := makeArguments() arguments := cmdArgs.copy()
arguments.addArg("S", "i") arguments.delTarget(aurS...)
//arguments.addArg(flags...)
arguments.addTarget(repoS...)
err = passToPacman(arguments) err = passToPacman(arguments)
if err != nil { if err != nil {