Skip to content

Commit ac88fa2

Browse files
committed
Change order of known ids a bit
INCOMPATIBLE ABI CHANGE
1 parent 7b1722f commit ac88fa2

1 file changed

Lines changed: 12 additions & 24 deletions

File tree

src/knownid.h

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ KNOWNID(REPOSITORY_EXTERNAL, "repository:external"),
7676
KNOWNID(REPOSITORY_KEYS, "repository:keys"),
7777
KNOWNID(REPOSITORY_LOCATION, "repository:location"),
7878

79-
/* file provides already added to our solvables */
80-
KNOWNID(REPOSITORY_ADDEDFILEPROVIDES, "repository:addedfileprovides"),
81-
/* inode of the rpm database for rpm --rebuilddb detection */
82-
KNOWNID(REPOSITORY_RPMDBCOOKIE, "repository:rpmdbcookie"),
83-
8479
/* the known data types */
8580
KNOWNID(REPOKEY_TYPE_VOID, "repokey:type:void"),
8681
KNOWNID(REPOKEY_TYPE_CONSTANT, "repokey:type:constant"),
@@ -145,6 +140,8 @@ KNOWNID(SOLVABLE_CHANGELOG, "solvable:changelog"),
145140
KNOWNID(SOLVABLE_CHANGELOG_AUTHOR, "solvable:changelog:author"),
146141
KNOWNID(SOLVABLE_CHANGELOG_TIME, "solvable:changelog:time"),
147142
KNOWNID(SOLVABLE_CHANGELOG_TEXT, "solvable:changelog:text"),
143+
KNOWNID(SOLVABLE_INSTALLSTATUS, "solvable:installstatus"), /* debian install status */
144+
KNOWNID(SOLVABLE_PREREQ_IGNOREINST, "solvable:prereq_ignoreinst"), /* ignore these pre-requires for installed packages */
148145

149146
/* stuff for solvables of type pattern */
150147
KNOWNID(SOLVABLE_CATEGORY, "solvable:category"),
@@ -187,6 +184,7 @@ KNOWNID(PRODUCT_URL_TYPE, "product:url:type"),
187184
KNOWNID(PRODUCT_FLAGS, "product:flags"), /* e.g. 'update', 'no_you' */
188185
KNOWNID(PRODUCT_PRODUCTLINE, "product:productline"), /* installed product only */
189186
KNOWNID(PRODUCT_REGISTER_TARGET, "product:regtarget"), /* installed and available product */
187+
KNOWNID(PRODUCT_REGISTER_FLAVOR, "product:regflavor"), /* installed and available product */
190188
KNOWNID(PRODUCT_REGISTER_RELEASE, "product:regrelease"), /* installed product only */
191189
KNOWNID(PRODUCT_UPDATES_REPOID, "product:updates:repoid"),
192190
KNOWNID(PRODUCT_UPDATES, "product:updates"),
@@ -204,21 +202,18 @@ KNOWNID(SUSETAGS_SHARE_NAME, "susetags:share:name"),
204202
KNOWNID(SUSETAGS_SHARE_EVR, "susetags:share:evr"),
205203
KNOWNID(SUSETAGS_SHARE_ARCH, "susetags:share:arch"),
206204

207-
/* timestamp then the repository was generated */
208-
KNOWNID(REPOSITORY_TIMESTAMP, "repository:timestamp"),
209-
/* hint when the metadata could be outdated w/respect to generated timestamp */
210-
KNOWNID(REPOSITORY_EXPIRE, "repository:expire"),
211-
/* which things does this repo provides updates for, if it does (array) */
212-
KNOWNID(REPOSITORY_UPDATES, "repository:updates"), /* obsolete? */
213-
/* which products this repository is supposed to be for (array) */
214-
KNOWNID(REPOSITORY_DISTROS, "repository:distros"),
205+
KNOWNID(REPOSITORY_ADDEDFILEPROVIDES, "repository:addedfileprovides"), /* file provides already added to our solvables */
206+
KNOWNID(REPOSITORY_RPMDBCOOKIE, "repository:rpmdbcookie"), /* inode of the rpm database for rpm --rebuilddb detection */
207+
KNOWNID(REPOSITORY_FILTEREDFILELIST, "repository:filteredfilelist"), /* filelist in repository is filtered */
208+
KNOWNID(REPOSITORY_TIMESTAMP, "repository:timestamp"), /* timestamp then the repository was generated */
209+
KNOWNID(REPOSITORY_EXPIRE, "repository:expire"), /* hint when the metadata could be outdated w/respect to generated timestamp */
210+
KNOWNID(REPOSITORY_UPDATES, "repository:updates"), /* which things does this repo provides updates for, if it does (array) (obsolete?) */
211+
KNOWNID(REPOSITORY_DISTROS, "repository:distros"), /* which products this repository is supposed to be for (array) */
215212
KNOWNID(REPOSITORY_PRODUCT_LABEL, "repository:product:label"),
216213
KNOWNID(REPOSITORY_PRODUCT_CPEID, "repository:product:cpeid"),
217214
KNOWNID(REPOSITORY_REPOID, "repository:repoid"), /* obsolete? */
218-
/* keyword (tags) for this repository */
219-
KNOWNID(REPOSITORY_KEYWORDS, "repository:keywords"),
220-
/* revision of the repository. arbitrary string */
221-
KNOWNID(REPOSITORY_REVISION, "repository:revision"),
215+
KNOWNID(REPOSITORY_KEYWORDS, "repository:keywords"), /* keyword (tags) for this repository */
216+
KNOWNID(REPOSITORY_REVISION, "repository:revision"), /* revision of the repository. arbitrary string */
222217
KNOWNID(REPOSITORY_TOOLVERSION, "repository:toolversion"),
223218

224219
KNOWNID(DELTA_PACKAGE_NAME, "delta:pkgname"),
@@ -256,13 +251,6 @@ KNOWNID(SIGNATURE_TIME, "signature:time"),
256251
KNOWNID(SIGNATURE_EXPIRES, "signature:expires"),
257252
KNOWNID(SIGNATURE_DATA, "signature:data"),
258253

259-
KNOWNID(PRODUCT_REGISTER_FLAVOR, "product:regflavor"), /* installed and available product */
260-
261-
KNOWNID(SOLVABLE_INSTALLSTATUS, "solvable:installstatus"), /* debian install status */
262-
263-
KNOWNID(SOLVABLE_PREREQ_IGNOREINST, "solvable:prereq_ignoreinst"), /* ignore these pre-requires for installed packages */
264-
KNOWNID(REPOSITORY_FILTEREDFILELIST, "repository:filteredfilelist"), /* filelist in repository is filtered */
265-
266254
KNOWNID(ID_NUM_INTERNAL, 0)
267255

268256
#ifdef KNOWNID_INITIALIZE

0 commit comments

Comments
 (0)