From: Michael Schroeder Date: Thu, 29 Jan 2015 14:16:43 +0000 (+0100) Subject: rename DEB_DEBSTATUS to SOLVABLE_INSTALLSTATUS X-Git-Tag: 0.6.9~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeddb56af580acebd4e2821a4a008ff6f206b071;p=thirdparty%2Flibsolv.git rename DEB_DEBSTATUS to SOLVABLE_INSTALLSTATUS Also move it to the end of knownid to not break the ABI. --- diff --git a/ext/repo_deb.c b/ext/repo_deb.c index 65a2f0e6..4ddb8a3c 100644 --- a/ext/repo_deb.c +++ b/ext/repo_deb.c @@ -315,7 +315,7 @@ control2solvable(Solvable *s, Repodata *data, char *control) break; case 'S' << 8 | 'T': if (!strcasecmp(tag, "status")) - repodata_set_str(data, s - pool->solvables, DEB_DEBSTATUS, q); + repodata_set_poolstr(data, s - pool->solvables, SOLVABLE_INSTALLSTATUS, q); break; case 'S' << 8 | 'U': if (!strcasecmp(tag, "suggests")) diff --git a/src/knownid.h b/src/knownid.h index 16098ac0..c094bf5b 100644 --- a/src/knownid.h +++ b/src/knownid.h @@ -45,7 +45,6 @@ KNOWNID(SOLVABLE_SUGGESTS, "solvable:suggests"), KNOWNID(SOLVABLE_SUPPLEMENTS, "solvable:supplements"), KNOWNID(SOLVABLE_ENHANCES, "solvable:enhances"), KNOWNID(RPM_RPMDBID, "rpm:dbid"), -KNOWNID(DEB_DEBSTATUS, "deb:status"), /* normal requires before this, prereqs after this */ KNOWNID(SOLVABLE_PREREQMARKER, "solvable:prereqmarker"), @@ -259,6 +258,8 @@ KNOWNID(SIGNATURE_DATA, "signature:data"), KNOWNID(PRODUCT_REGISTER_FLAVOR, "product:regflavor"), /* installed and available product */ +KNOWNID(SOLVABLE_INSTALLSTATUS, "solvable:installstatus"), /* debian install status */ + KNOWNID(ID_NUM_INTERNAL, 0) #ifdef KNOWNID_INITIALIZE