diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-02-07 11:32:55 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-02-07 11:32:55 +0100 |
| commit | 6a910c9db4d450241a57f61b2d3d3e302bb9c11c (patch) | |
| tree | e58a9420d269e08c011abfa4f34e0c42aeeefc78 /apt-pkg | |
| parent | fbd64f76a595b61d2aaa9c0615903d9b68786930 (diff) | |
allow conflicts in the same group again (Closes: #612099)
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/depcache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5f59b6d49..7c09d3a38 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -339,7 +339,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) /* Check simple depends. A depends -should- never self match but we allow it anyhow because dpkg does. Technically it is a packaging bug. Conflicts may never self match */ - if (Dep.TargetPkg()->Group != Dep.ParentPkg()->Group || + if (Dep.TargetPkg() != Dep.ParentPkg() || (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes)) { PkgIterator Pkg = Dep.TargetPkg(); |