aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config.nim2
-rw-r--r--src/feature/syncinstall.nim2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/config.nim b/src/config.nim
index 42b9b70..629cdfa 100644
--- a/src/config.nim
+++ b/src/config.nim
@@ -122,6 +122,6 @@ proc obtainConfig*(config: PacmanConfig): Config =
Config(root: root, db: db, tmpRoot: tmpRoot, color: color,
dbs: config.dbs, arch: config.arch, debug: config.debug, progressBar: config.progressBar,
verbosePkgList: config.verbosePkgList, pgpKeyserver: config.pgpKeyserver,
- ignorePkgs: config.ignoreGroups, ignoreGroups: config.ignoreGroups,
+ ignorePkgs: config.ignorePkgs, ignoreGroups: config.ignoreGroups,
aurComments: aurComments, checkIgnored: checkIgnored,
printAurNotFound: printAurNotFound, viewNoDefault: viewNoDefault)
diff --git a/src/feature/syncinstall.nim b/src/feature/syncinstall.nim
index d9762ed..4727f25 100644
--- a/src/feature/syncinstall.nim
+++ b/src/feature/syncinstall.nim
@@ -759,7 +759,7 @@ proc filterIgnoresAndConflicts(config: Config, pkgInfos: seq[PackageInfo],
else:
true))
- let nonConflicingPkgInfos = pkgInfos.foldl(block:
+ let nonConflicingPkgInfos = acceptedPkgInfos.foldl(block:
let conflictsWith = lc[p | (p <- a, p.name != b.name and
(lc[0 | (c <- b.conflicts, c.isProvidedBy(p.toPackageReference)), int].len > 0 or
lc[0 | (c <- p.conflicts, c.isProvidedBy(b.toPackageReference)), int].len > 0)),