Przeglądaj źródła

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.
Raphaël Hertzog 15 lat temu
rodzic
commit
5f48b4cfe1
2 zmienionych plików z 4 dodań i 1 usunięć
  1. 2 0
      debian/changelog
  2. 2 1
      src/depcon.c

+ 2 - 0
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

+ 2 - 1
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,