- refactor the repository matching with products, not yet complete

- move the cpename up to resobject as it is a generic attribute
  (and can be useful to match vulnerabilities in the future)

diff --git a/src/knownid.h b/src/knownid.h
index ae49987..6fb3fb0 100644 (file)
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -95,6 +95,7 @@ KNOWNID(SOLVABLE_LICENSE,             "solvable:license"),
 KNOWNID(SOLVABLE_BUILDTIME,            "solvable:buildtime"),
 KNOWNID(SOLVABLE_BUILDHOST,            "solvable:buildhost"),
 KNOWNID(SOLVABLE_EULA,                 "solvable:eula"),
+KNOWNID(SOLVABLE_CPE_NAME,             "solvable:cpename"),
 KNOWNID(SOLVABLE_MESSAGEINS,           "solvable:messageins"),
 KNOWNID(SOLVABLE_MESSAGEDEL,           "solvable:messagedel"),
 KNOWNID(SOLVABLE_INSTALLSIZE,          "solvable:installsize"),
@@ -158,7 +159,6 @@ KNOWNID(PRODUCT_REFERENCES,         "product:references"),
 KNOWNID(PRODUCT_UPDATEREPOKEY,         "product:updaterepokey"),
 KNOWNID(PRODUCT_REGISTER_TARGET,       "product:regtarget"),
 KNOWNID(PRODUCT_REGISTER_RELEASE,      "product:regrelease"),
-KNOWNID(PRODUCT_CPE_NAME,              "product:cpename"),
 
 /* argh */
 KNOWNID(SUSETAGS_DATADIR,              "susetags:datadir"),

diff --git a/tools/repo_products.c b/tools/repo_products.c
index b42d6da..022b400 100644 (file)
--- a/tools/repo_products.c
+++ b/tools/repo_products.c
@@ -355,7 +355,7 @@ endElement(void *userData, const char *name)
     break;
     case STATE_CPENAME:
       if (pd->content)
-        repodata_set_str(pd->data, pd->handle, PRODUCT_CPE_NAME, pd->content);
+        repodata_set_str(pd->data, pd->handle, SOLVABLE_CPE_NAME, pd->content);
     default:
       break;
     }