From 9f2cc1571a06685d28f1b8b0becf4406dda4177b Mon Sep 17 00:00:00 2001 From: kitsunyan Date: Thu, 3 May 2018 17:15:26 +0300 Subject: Remove unnecessary "pacmanTargets" arg from "resolveDependencies" --- src/feature/syncinstall.nim | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/feature/syncinstall.nim b/src/feature/syncinstall.nim index 61bd857..ec8c064 100644 --- a/src/feature/syncinstall.nim +++ b/src/feature/syncinstall.nim @@ -573,9 +573,9 @@ proc deduplicatePkgInfos(pkgInfos: seq[PackageInfo], a & b, newSeq[PackageInfo]()) -proc resolveDependencies(config: Config, pacmanTargets: seq[FullPackageTarget[PackageInfo]], - pkgInfos: seq[PackageInfo], additionalPkgInfos: seq[PackageInfo], - printMode: bool, directSome: bool, noaur: bool): (bool, Table[PackageReference, SatisfyResult], +proc resolveDependencies(config: Config, pkgInfos: seq[PackageInfo], + additionalPkgInfos: seq[PackageInfo], printMode: bool, directSome: bool, + noaur: bool): (bool, Table[PackageReference, SatisfyResult], seq[string], seq[seq[seq[PackageInfo]]], seq[string]) = if pkgInfos.len > 0 and not printMode: if directSome: @@ -750,8 +750,7 @@ proc handleInstall(args: seq[Argument], config: Config, upgradeCount: int, else: let commonArgs = args.keepOnlyOptions(commonOptions, upgradeCommonOptions) let (resolveSuccess, satisfied, additionalPacmanTargets, basePackages, dependencyPaths) = - resolveDependencies(config, pacmanTargets, pkgInfos, additionalPkgInfos, - false, directSome, noaur) + resolveDependencies(config, pkgInfos, additionalPkgInfos, false, directSome, noaur) let paths = initialPaths & dependencyPaths let confirmAndResolveCode = if resolveSuccess: @@ -846,7 +845,7 @@ proc handlePrint(args: seq[Argument], config: Config, printFormat: string, upgra let directPacmanTargets = pacmanTargets.map(`$`) let (resolveSuccess, _, additionalPacmanTargets, basePackages, _) = - resolveDependencies(config, pacmanTargets, pkgInfos, additionalPkgInfos, true, false, noaur) + resolveDependencies(config, pkgInfos, additionalPkgInfos, true, false, noaur) let code = if directPacmanTargets.len > 0 or additionalPacmanTargets.len > 0 or upgradeCount > 0: (block: -- cgit v1.2.3-70-g09d2