From 04a9830e0b8f6799e28d7f530e3d780125bd2688 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Tue, 27 Feb 2018 03:41:39 +0000 Subject: [PATCH] Fix tests --- cmd.go | 3 +-- install.go | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd.go b/cmd.go index 2a54afed..c7a6dadd 100644 --- a/cmd.go +++ b/cmd.go @@ -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) { diff --git a/install.go b/install.go index 45f78ba9..8fbf2eb9 100644 --- a/install.go +++ b/install.go @@ -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)) } }