From 2b6a73041f7a4e486b3b1d7bf6f928b0d8a02eae Mon Sep 17 00:00:00 2001 From: morganamilo Date: Tue, 4 Sep 2018 18:23:05 +0100 Subject: [PATCH] Fix redownload logic --redownload was reversed and redownloaded the deps instead of the targets. --- install.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/install.go b/install.go index ecceb784..0f4d3d42 100644 --- a/install.go +++ b/install.go @@ -796,14 +796,16 @@ func pkgbuildsToSkip(bases []Base, targets stringSet) stringSet { isTarget = isTarget || targets.get(pkg.Name) } - if config.ReDownload == "no" || (config.ReDownload == "yes" && isTarget) { - dir := filepath.Join(config.BuildDir, base.Pkgbase(), ".SRCINFO") - pkgbuild, err := gosrc.ParseFile(dir) + if (config.ReDownload == "yes" && isTarget) || config.ReDownload == "all" { + continue + } - if err == nil { - if alpm.VerCmp(pkgbuild.Version(), base.Version()) >= 0 { - toSkip.set(base.Pkgbase()) - } + dir := filepath.Join(config.BuildDir, base.Pkgbase(), ".SRCINFO") + pkgbuild, err := gosrc.ParseFile(dir) + + if err == nil { + if alpm.VerCmp(pkgbuild.Version(), base.Version()) >= 0 { + toSkip.set(base.Pkgbase()) } } }