diff options
| author | Guillem Jover <guillem@debian.org> | 2010-10-24 03:16:00 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2010-11-19 05:21:13 +0100 |
| commit | a3dd7c610183c6f5515d69178b8a848ea1d82b87 (patch) | |
| tree | 22d5ffa7a5837d5c8da75b8db9a6b300014a0c80 /dselect | |
| parent | f74dfc666ea193a85de5e5f26b079506b289843f (diff) | |
| download | dpkg-a3dd7c610183c6f5515d69178b8a848ea1d82b87.tar.gz | |
libdpkg: Rename informative to pkg_is_informative
Diffstat (limited to 'dselect')
| -rw-r--r-- | dselect/pkgdepcon.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index ca69ec74d..267dfaada 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -38,7 +38,7 @@ packagelist::useavailable(pkginfo *pkg) { if (pkg->clientdata && pkg->clientdata->selected == pkginfo::want_install && - informative(pkg,&pkg->available) && + pkg_is_informative(pkg, &pkg->available) && (!(pkg->status == pkginfo::stat_installed || pkg->status == pkginfo::stat_triggersawaited || pkg->status == pkginfo::stat_triggerspending) || @@ -133,10 +133,12 @@ static int dep_update_best_to_change_stop(perpackagestate *& best, pkginfo *tryt if (!best) goto yes; // If only one of the packages is available, use that one - if (!informative(trythis,&trythis->available) && - informative(best->pkg,&best->pkg->available)) return 0; - if (informative(trythis,&trythis->available) && - !informative(best->pkg,&best->pkg->available)) goto yes; + if (!pkg_is_informative(trythis, &trythis->available) && + pkg_is_informative(best->pkg, &best->pkg->available)) + return 0; + if (pkg_is_informative(trythis, &trythis->available) && + !pkg_is_informative(best->pkg, &best->pkg->available)) + goto yes; // Select the package with the lowest priority (ie, the one of whom // we were least sure we wanted it deselected). |