From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Wed, 1 Oct 2008 11:21:57 +0000 (+0000)
Subject: cpename -> cpeid
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb7870c29ccfe8d5a853c025f07f67b4b926b063;p=thirdparty%2Flibsolv.git

cpename -> cpeid
---

diff --git a/src/knownid.h b/src/knownid.h
index 6fb3fb00..e3a847a9 100644
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -95,7 +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_CPE_ID,	        "solvable:cpeid"),
 KNOWNID(SOLVABLE_MESSAGEINS,		"solvable:messageins"),
 KNOWNID(SOLVABLE_MESSAGEDEL,		"solvable:messagedel"),
 KNOWNID(SOLVABLE_INSTALLSIZE,		"solvable:installsize"),
diff --git a/tools/repo_products.c b/tools/repo_products.c
index 4628bb20..5dad3c03 100644
--- a/tools/repo_products.c
+++ b/tools/repo_products.c
@@ -46,7 +46,7 @@ enum state {
   STATE_SUMMARY,         // 7
   STATE_DESCRIPTION,     // 8
   STATE_UPDATEREPOKEY,   // 9 should go away
-  STATE_CPENAME,         // 9
+  STATE_CPEID,         // 9
   STATE_URLS,            // 10
   STATE_URL,             // 11
   STATE_RUNTIMECONFIG,   // 12
@@ -81,7 +81,7 @@ static struct stateswitch stateswitches[] = {
   { STATE_PRODUCT,   "runtimeconfig", STATE_RUNTIMECONFIG, 0 },
   { STATE_PRODUCT,   "linguas",       STATE_LINGUAS,       0 },
   { STATE_PRODUCT,   "updaterepokey", STATE_UPDATEREPOKEY, 1 },
-  { STATE_PRODUCT,   "cpename",       STATE_CPENAME,       1 },
+  { STATE_PRODUCT,   "cpename",       STATE_CPEID,       1 },
   { STATE_URLS,      "url",           STATE_URL,           1 },
   { STATE_LINGUAS,   "lang",          STATE_LANG,          0 },
   { STATE_REGISTER,  "flavor",        STATE_FLAVOR,        1 },
@@ -354,9 +354,9 @@ endElement(void *userData, const char *name)
 	  printf("%s\n", pd->content);
 	}
     break;
-    case STATE_CPENAME:
+    case STATE_CPEID:
       if (pd->content)
-        repodata_set_str(pd->data, pd->handle, SOLVABLE_CPE_NAME, pd->content);
+        repodata_set_str(pd->data, pd->handle, SOLVABLE_CPE_ID, pd->content);
     default:
       break;
     }