diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2011-05-14 10:26:23 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2011-05-14 22:14:48 +0200 |
| commit | 2b8cfa50709558709d5e24d7a3fa27b925bce74d (patch) | |
| tree | 617c933d097e6eed41484216353e9fc0ee3d55f1 /src/enquiry.c | |
| parent | f95177fdacdd58e1c25fa722213477bd7f57df26 (diff) | |
| download | dpkg-2b8cfa50709558709d5e24d7a3fa27b925bce74d.tar.gz | |
dpkg: depisok() can now suggest to process awaited triggers for a package
Package in triggers-awaited state do not satisfy dependencies but they
could easily if their awaited triggers were processed. So we enhance the
function to return such a hint when possible.
All the callers pass NULL to the new parameter so that this commit
should not change the current behaviour.
Diffstat (limited to 'src/enquiry.c')
| -rw-r--r-- | src/enquiry.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/enquiry.c b/src/enquiry.c index 26d1d2830..25ae142b8 100644 --- a/src/enquiry.c +++ b/src/enquiry.c @@ -388,7 +388,7 @@ predeppackage(const char *const *argv) pkg->clientdata->istobe= itb_preinstall; for (dep= pkg->available.depends; dep; dep= dep->next) { if (dep->type != dep_predepends) continue; - if (depisok(dep, &vb, NULL, true)) + if (depisok(dep, &vb, NULL, NULL, true)) continue; /* This will leave dep non-NULL, and so exit the loop. */ break; @@ -438,7 +438,7 @@ predeppackage(const char *const *argv) pkg->clientdata->istobe= itb_preinstall; for (dep= pkg->available.depends; dep; dep= dep->next) { if (dep->type != dep_predepends) continue; - if (depisok(dep, &vb, NULL, true)) + if (depisok(dep, &vb, NULL, NULL, true)) continue; /* This will leave dep non-NULL, and so exit the loop. */ break; |