system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-31 13:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lint

Browse source
This commit is contained in:
morganamilo 2018-06-10 02:02:24 +01:00
parent 4f8b43cd60
commit 2b925aefa3
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
install.go
View file

@ -160,7 +160,7 @@ func install(parser *arguments) error {
if err != nil { if err != nil {
return err return err
} }
if len(toEdit) > 0 { if len(toEdit) > 0 {
if config.ShowDiffs { if config.ShowDiffs {
err = showPkgBuildDiffs(toEdit, do.Bases) err = showPkgBuildDiffs(toEdit, do.Bases)
@ -184,7 +184,6 @@ func install(parser *arguments) error {
return err return err
} }
//initial srcinfo parse before pkgver() bump //initial srcinfo parse before pkgver() bump
err = parseSRCINFOFiles(do.Aur, srcinfosStale, do.Bases) err = parseSRCINFOFiles(do.Aur, srcinfosStale, do.Bases)
if err != nil { if err != nil {
@ -621,7 +620,7 @@ func pkgBuildsToSkip(pkgs []*rpc.Pkg, targets stringSet) stringSet {
func mergePkgBuilds(pkgs []*rpc.Pkg) error { func mergePkgBuilds(pkgs []*rpc.Pkg) error {
for _, pkg := range pkgs { for _, pkg := range pkgs {
if shouldUseGit(filepath.Join(config.BuildDir, pkg.PackageBase)) { if shouldUseGit(filepath.Join(config.BuildDir, pkg.PackageBase)) {
err := gitMerge(baseURL + "/" + pkg.PackageBase + ".git", config.BuildDir, pkg.PackageBase) err := gitMerge(baseURL+"/"+pkg.PackageBase+".git", config.BuildDir, pkg.PackageBase)
if err != nil { if err != nil {
return err return err
} }
@ -631,7 +630,6 @@ func mergePkgBuilds(pkgs []*rpc.Pkg) error {
return nil return nil
} }
func downloadPkgBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, toSkip stringSet) error { func downloadPkgBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, toSkip stringSet) error {
for k, pkg := range pkgs { for k, pkg := range pkgs {
if toSkip.get(pkg.PackageBase) { if toSkip.get(pkg.PackageBase) {
@ -645,7 +643,7 @@ func downloadPkgBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, toSkip stri
fmt.Printf(str, k+1, len(pkgs), cyan(formatPkgbase(pkg, bases))) fmt.Printf(str, k+1, len(pkgs), cyan(formatPkgbase(pkg, bases)))
if shouldUseGit(filepath.Join(config.BuildDir, pkg.PackageBase)) { if shouldUseGit(filepath.Join(config.BuildDir, pkg.PackageBase)) {
err := gitDownload(baseURL + "/" + pkg.PackageBase + ".git", config.BuildDir, pkg.PackageBase) err := gitDownload(baseURL+"/"+pkg.PackageBase+".git", config.BuildDir, pkg.PackageBase)
if err != nil { if err != nil {
return err return err
} }