diff options
| author | Ian Jackson <ian@davenant.greenend.org.uk> | 2008-03-22 06:07:44 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2008-03-22 06:30:07 +0200 |
| commit | 7a3c7d383804d1578e00a3519f5feb48268fc1a9 (patch) | |
| tree | 035c43e5b94e38208aa686f5c874fa060acdce57 /src | |
| parent | 3b48df2ea3061a46247e1ca216f42e184270f70e (diff) | |
| download | dpkg-7a3c7d383804d1578e00a3519f5feb48268fc1a9.tar.gz | |
Sort entries in enum pkgstatus
Fix all users that rely on the enum sorting.
Diffstat (limited to 'src')
| -rw-r--r-- | src/help.c | 6 | ||||
| -rw-r--r-- | src/packages.c | 4 | ||||
| -rw-r--r-- | src/processarc.c | 2 | ||||
| -rw-r--r-- | src/query.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/help.c b/src/help.c index d7f2f0401..6bb9f2a43 100644 --- a/src/help.c +++ b/src/help.c @@ -39,11 +39,11 @@ const char *const statusstrings[]= { N_("not installed"), + N_("not installed but configs remain"), + N_("broken due to failed removal"), N_("unpacked but not configured"), N_("broken due to postinst failure"), - N_("installed"), - N_("broken due to failed removal"), - N_("not installed but configs remain") + N_("installed") }; struct filenamenode *namenodetouse(struct filenamenode *namenode, struct pkginfo *pkg) { diff --git a/src/packages.c b/src/packages.c index 59dce61d9..00321fa16 100644 --- a/src/packages.c +++ b/src/packages.c @@ -176,7 +176,7 @@ void process_queue(void) { if (!pkg) continue; /* duplicate, which we removed earlier */ - assert(pkg->status <= stat_configfiles); + assert(pkg->status <= stat_installed); if (setjmp(ejbuf)) { /* give up on it from the point of view of other packages, ie reset istobe */ @@ -279,9 +279,9 @@ static int deppossi_ok_found(struct pkginfo *possdependee, return thisf; } switch (possdependee->status) { - case stat_installed: case stat_unpacked: case stat_halfconfigured: + case stat_installed: assert(possdependee->installed.valid); if (checkversion && !versionsatisfied(&possdependee->installed,checkversion)) { varbufprintf(oemsgs, _(" Version of %s on system is %s.\n"), diff --git a/src/processarc.c b/src/processarc.c index ba2aaa61c..271e1b86e 100644 --- a/src/processarc.c +++ b/src/processarc.c @@ -383,7 +383,7 @@ void process_archive(const char *filename) { oldversionstatus= pkg->status; - assert(oldversionstatus <= stat_configfiles); + assert(oldversionstatus <= stat_installed); debug(dbg_general,"process_archive oldversionstatus=%s", statusstrings[oldversionstatus]); diff --git a/src/query.c b/src/query.c index c50ddded9..ae5f0cad4 100644 --- a/src/query.c +++ b/src/query.c @@ -146,7 +146,7 @@ Desired=Unknown/Install/Remove/Purge/Hold\n\ limiteddescription(pkg,dw,&pdesc,&l); printf(format, "uihrp"[pkg->want], - "nUFiHc"[pkg->status], + "ncHUFi"[pkg->status], " R?#"[pkg->eflag], pkg->name, versiondescribe(&pkg->installed.version, vdew_nonambig), |