diff options
| author | Guillem Jover <guillem@debian.org> | 2014-06-02 06:37:29 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2014-06-02 06:37:29 +0200 |
| commit | 63b138afa6ca41ff33c3a282187bd2de1826c489 (patch) | |
| tree | aec4e2a6956b9b0979de00151219e0c63058d081 /dselect/pkgdepcon.cc | |
| parent | 8fc618ad8e8df6efbcd52c5d96500f65e9c1b8db (diff) | |
| download | dpkg-63b138afa6ca41ff33c3a282187bd2de1826c489.tar.gz | |
libdpkg: Uppercase and namespace pkgstatus enum values
Diffstat (limited to 'dselect/pkgdepcon.cc')
| -rw-r--r-- | dselect/pkgdepcon.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index ffec14450..712c683f8 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -38,9 +38,9 @@ packagelist::useavailable(pkginfo *pkg) if (pkg->clientdata && pkg->clientdata->selected == PKG_WANT_INSTALL && pkg_is_informative(pkg, &pkg->available) && - (!(pkg->status == stat_installed || - pkg->status == stat_triggersawaited || - pkg->status == stat_triggerspending) || + (!(pkg->status == PKG_STAT_INSTALLED || + pkg->status == PKG_STAT_TRIGGERSAWAITED || + pkg->status == PKG_STAT_TRIGGERSPENDING) || dpkg_version_compare(&pkg->available.version, &pkg->installed.version) > 0)) return true; @@ -204,7 +204,7 @@ packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *dep) if (best->spriority >= sp_deselecting) return 0; best->suggested= - best->pkg->status == stat_notinstalled + best->pkg->status == PKG_STAT_NOTINSTALLED ? PKG_WANT_PURGE : PKG_WANT_DEINSTALL; // FIXME: configurable. best->selected= best->suggested; best->spriority= sp_deselecting; @@ -328,7 +328,7 @@ int packagelist::resolvedepcon(dependency *depends) { /* Always remove depends, but never remove recommends. */ if (depends->type != dep_recommends) { best->selected= best->suggested= - best->pkg->status == stat_notinstalled + best->pkg->status == PKG_STAT_NOTINSTALLED ? PKG_WANT_PURGE : PKG_WANT_DEINSTALL; // FIXME: configurable best->spriority= sp_deselecting; } @@ -443,9 +443,9 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade) if (useavailable(provider->up->up)) return true; if (fixbyupgrade && !*fixbyupgrade && - (!(provider->up->up->status == stat_installed || - provider->up->up->status == stat_triggerspending || - provider->up->up->status == stat_triggersawaited) || + (!(provider->up->up->status == PKG_STAT_INSTALLED || + provider->up->up->status == PKG_STAT_TRIGGERSPENDING || + provider->up->up->status == PKG_STAT_TRIGGERSAWAITED) || dpkg_version_compare(&provider->up->up->available.version, &provider->up->up->installed.version) > 1)) *fixbyupgrade = provider->up->up->clientdata; |