diff options
author | Guillem Jover <guillem@debian.org> | 2009-07-14 12:04:47 +0200 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2009-07-14 12:04:47 +0200 |
commit | fb6c4a7a7a46b8ba7d6e6ff959bf6b23058690bb (patch) | |
tree | a5bd1f7dbceebf8f03a7febe214a77f069b35a61 | |
parent | 5bd53bc1a8d179ff1891b0362ac1968b36d31faa (diff) | |
download | dpkg-fb6c4a7a7a46b8ba7d6e6ff959bf6b23058690bb.tar.gz |
Remove obsolete ‘hold’ and ‘hold-reinstreq’ internal status flags
These flags have been obsolete for a long time, and the ‘hold’ part
has been converted to the ‘want_hold’ value on database parse. No
current system having been upgraded through several Debian releases
should have those values in their status database anymore.
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | dselect/pkgdisplay.cc | 2 | ||||
-rw-r--r-- | lib/dpkg-db.h | 5 | ||||
-rw-r--r-- | lib/dump.c | 2 | ||||
-rw-r--r-- | lib/fields.c | 4 | ||||
-rw-r--r-- | lib/parsehelp.c | 2 | ||||
-rw-r--r-- | src/query.c | 4 |
7 files changed, 6 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 7e2acae3a..be1d363b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ dpkg (1.15.4) UNRELEASED; urgency=low * Document “hold” under package selection states instead of flags in dpkg(1). * Remove trailing ‘/’ and ‘/.’ from the directory name to be used as the package name on “dpkg-deb -b”. Closes: #218018, #373602 + * Remove obsolete ‘hold’ and ‘hold-reinstreq’ internal status flags. [ Raphael Hertzog ] * Replace install-info by a wrapper around GNU's install-info. The wrapper diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc index 2832d412b..1cfae69d3 100644 --- a/dselect/pkgdisplay.cc +++ b/dselect/pkgdisplay.cc @@ -88,7 +88,7 @@ const char N_("?") }; const char statuschars[] = " -IUCWt*"; -const char eflagchars[]= " R?#"; +const char eflagchars[] = " R"; const char wantchars[]= "n*=-_"; /* These MUST be in the same order as the corresponding enums in pkglist.h */ diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h index 23faf14ec..2a3af5429 100644 --- a/lib/dpkg-db.h +++ b/lib/dpkg-db.h @@ -147,12 +147,9 @@ struct pkginfo { /* pig */ } want; enum pkgeflag { eflagf_reinstreq = 01, - eflagf_obsoletehold = 02, eflagv_ok = 0, eflagv_reinstreq = eflagf_reinstreq, - eflagv_obsoletehold = eflagf_obsoletehold, - eflagv_obsoleteboth = eflagf_reinstreq | eflagf_obsoletehold - } eflag; /* bitmask, but obsoletehold no longer used except when reading */ + } eflag; /* Bitmask. */ enum pkgstatus { stat_notinstalled, stat_configfiles, diff --git a/lib/dump.c b/lib/dump.c index 0d4bb4416..47c4934b0 100644 --- a/lib/dump.c +++ b/lib/dump.c @@ -168,7 +168,7 @@ void w_status(struct varbuf *vb, enum fwriteflags flags, const struct fieldinfo *fip) { if (pifp != &pigp->installed) return; assert(pigp->want <= want_purge); - assert(pigp->eflag <= eflagv_reinstreq); /* hold and hold-reinstreq NOT allowed */ + assert(pigp->eflag <= eflagv_reinstreq); #define PEND pigp->trigpend_head #define AW pigp->trigaw.head diff --git a/lib/fields.c b/lib/fields.c index 884071016..3cf6f524a 100644 --- a/lib/fields.c +++ b/lib/fields.c @@ -171,10 +171,6 @@ void f_status(struct pkginfo *pigp, struct pkginfoperfile *pifp, -1, pigp, value, wantinfos, &ep); pigp->eflag = convert_string(ps, _("second (error) word in `status' field"), -1, pigp, ep, eflaginfos, &ep); - if (pigp->eflag & eflagf_obsoletehold) { - pigp->want= want_hold; - pigp->eflag &= ~eflagf_obsoletehold; - } pigp->status = convert_string(ps, _("third (status) word in `status' field"), -1, pigp, ep, statusinfos, NULL); } diff --git a/lib/parsehelp.c b/lib/parsehelp.c index 63de26671..0574fcbab 100644 --- a/lib/parsehelp.c +++ b/lib/parsehelp.c @@ -119,8 +119,6 @@ const struct namevalue statusinfos[]= { /* Note ! These must be in order ! */ const struct namevalue eflaginfos[]= { /* Note ! These must be in order ! */ { "ok", eflagv_ok, 2 }, { "reinstreq", eflagv_reinstreq, 9 }, - { "hold", eflagv_obsoletehold, 4 }, - { "hold-reinstreq", eflagv_obsoleteboth, 14 }, { NULL } }; diff --git a/src/query.c b/src/query.c index 9e68d296a..34fb0d92b 100644 --- a/src/query.c +++ b/src/query.c @@ -113,7 +113,7 @@ list1package(struct pkginfo *pkg, int *head, struct pkg_array *array) fputs(_("\ Desired=Unknown/Install/Remove/Purge/Hold\n\ | Status=Not/Inst/Cfg-files/Unpacked/Failed-cfg/Half-inst/trig-aWait/Trig-pend\n\ -|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"), stdout); +|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)\n"), stdout); printf(format,'|','|','/', _("Name"), _("Version"), 40, _("Description")); printf("+++-"); /* status */ for (l=0;l<nw;l++) printf("="); printf("-"); /* packagename */ @@ -127,7 +127,7 @@ Desired=Unknown/Install/Remove/Purge/Hold\n\ printf(format, "uihrp"[pkg->want], "ncHUFWti"[pkg->status], - " R?#"[pkg->eflag], + " R"[pkg->eflag], pkg->name, versiondescribe(&pkg->installed.version, vdew_nonambig), l, pdesc); |