summaryrefslogtreecommitdiff
path: root/dselect
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2014-05-28 00:51:01 +0200
committerGuillem Jover <guillem@debian.org>2014-05-28 00:51:01 +0200
commit0bac29bc7ceb5e8eb7816a61720dc7ae1e4fe693 (patch)
treea640eb6ce4e5cfc548cbdbf43197162503c5f8eb /dselect
parentd3d70a975903a567c799b3f05f2cc4521a497dbf (diff)
downloaddpkg-0bac29bc7ceb5e8eb7816a61720dc7ae1e4fe693.tar.gz
libdpkg: Uppercase dpkg_relation enum values
Diffstat (limited to 'dselect')
-rw-r--r--dselect/pkgdepcon.cc2
-rw-r--r--dselect/pkgsublist.cc14
2 files changed, 8 insertions, 8 deletions
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index f082d5ec4..2fb7013cb 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -414,7 +414,7 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade)
return false;
}
}
- if (possi->verrel != dpkg_relation_none)
+ if (possi->verrel != DPKG_RELATION_NONE)
return false;
deppossi *provider;
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 1e5e1d7a7..c775dbb66 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -131,21 +131,21 @@ packagelist::add(dependency *depends, showpriority displayimportance)
possi=possi->next, comma=(possi && possi->next ? ", " : _(" or "))) {
info(comma);
info(possi->ed->name);
- if (possi->verrel != dpkg_relation_none) {
+ if (possi->verrel != DPKG_RELATION_NONE) {
switch (possi->verrel) {
- case dpkg_relation_le:
+ case DPKG_RELATION_LE:
info(" (<= ");
break;
- case dpkg_relation_ge:
+ case DPKG_RELATION_GE:
info(" (>= ");
break;
- case dpkg_relation_lt:
+ case DPKG_RELATION_LT:
info(" (<< ");
break;
- case dpkg_relation_gt:
+ case DPKG_RELATION_GT:
info(" (>> ");
break;
- case dpkg_relation_eq:
+ case DPKG_RELATION_EQ:
info(" (= ");
break;
default:
@@ -159,7 +159,7 @@ packagelist::add(dependency *depends, showpriority displayimportance)
add(depends->up,info.string(),displayimportance);
for (possi=depends->list; possi; possi=possi->next) {
add(&possi->ed->pkg, info.string(), displayimportance);
- if (possi->verrel == dpkg_relation_none && depends->type != dep_provides) {
+ if (possi->verrel == DPKG_RELATION_NONE && depends->type != dep_provides) {
// providers aren't relevant if a version was specified, or
// if we're looking at a provider relationship already
deppossi *provider;