The following commit has been merged in the master branch: commit 5f48b4cfe18848fb11ef96a34ef5826a1f3757b2 Author: Raphaël Hertzog <hert...@debian.org> Date: Sat May 14 21:35:03 2011 +0200
dpkg: small bugfix in the dependency checking code for virtual packages A dependency on a virtual package provided by a package in triggers-pending status is now correctly considered as satisfied. diff --git a/debian/changelog b/debian/changelog index 2b5e7b0..96c909b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low quilt. Thanks to Mike Hommey for noticing the problem. * Change behaviour of dpkg-source's --extend-diff-ignore to also extend the current diff-ignore if it has already been set. + * Fix dependency checking code to consider a dependency on a virtual + package provided by a package in triggers-pending status as satisfied. [ Guillem Jover ] * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520 diff --git a/src/depcon.c b/src/depcon.c index 1baa2d7..4b6f886 100644 --- a/src/depcon.c +++ b/src/depcon.c @@ -379,7 +379,8 @@ depisok(struct dependency *dep, struct varbuf *whynot, provider->up->up->name, possi->ed->name); break; case itb_normal: case itb_preinstall: - if (provider->up->up->status == stat_installed) + if (provider->up->up->status == stat_installed || + provider->up->up->status == stat_triggerspending) return true; sprintf(linebuf, _(" %.250s provides %.250s but is %s.\n"), provider->up->up->name, possi->ed->name, -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org