Merge pull request #180 from Morganamilo/fixtests

Fix tests
This commit is contained in:
Morgana authored and GitHub committed 2018-02-27 03:44:08 +00:00
commit 49fe3b5a28
2 files changed
+4 -5

No files matched your search

+1 -2
View File
@@ -59,8 +59,7 @@ Yay specific options:
-c --clean Remove unneeded dependencies
--gendb Generates development package DB used for updating.
If no operation is provided -Y will be assumed
`)
If no operation is provided -Y will be assumed`)
}
func initYay() (err error) {
+3 -3
View File
@@ -179,7 +179,7 @@ func install(parser *arguments) error {
return nil
}
err = downloadPkgBuildsSources(dc.Aur)
err = downloadPkgBuildsSources(dc.Aur, dc.Bases)
if err != nil {
return err
}
@@ -389,12 +389,12 @@ func dowloadPkgBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) (err error)
return
}
func downloadPkgBuildsSources(pkgs []*rpc.Pkg) (err error) {
func downloadPkgBuildsSources(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) (err error) {
for _, pkg := range pkgs {
dir := config.BuildDir + pkg.PackageBase + "/"
err = passToMakepkg(dir, "--nobuild", "--nocheck", "--noprepare", "--nodeps")
if err != nil {
return fmt.Errorf("Error downloading sources: %s", pkg)
return fmt.Errorf("Error downloading sources: %s", formatPkgbase(pkg, bases))
}
}