diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-01-13 15:45:08 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-01-13 15:45:08 +0100 |
| commit | 854341141df83c767bb4310e9e6084c5a4bff7f7 (patch) | |
| tree | cb17502753a5c11bb14781f7288a79635b18fd5a /apt-pkg/packagemanager.cc | |
| parent | 5f909b67fb903f700df1bd6242ada86d58c0b068 (diff) | |
factor out the detection of self-conflicts into Dep::IsIgnorable
Diffstat (limited to 'apt-pkg/packagemanager.cc')
| -rw-r--r-- | apt-pkg/packagemanager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 4f9762701..c9d7a3024 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -250,7 +250,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D, continue; // Ignore self conflicts, ignore conflicts from irrelevent versions - if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer()) + if (D.IsIgnorable(Pkg) || D.ParentVer() != D.ParentPkg().CurrentVer()) continue; if (Cache.VS().CheckDep(Ver,D->CompareOp,D.TargetVer()) == false) |