diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 22:17:23 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 22:17:23 +0100 |
| commit | e70c1d067335bfa686fa0c6e75e32afb095e1aaa (patch) | |
| tree | e985e74ed4d613126b24839d710e4b49db753824 /apt-pkg/packagemanager.cc | |
| parent | e75aa33384d52635fba502bed628bc68f9cb5066 (diff) | |
| parent | 85e1885525977809ff6a3b70abb84d3a63e41817 (diff) | |
merged from debian-experimental2
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) |