From: Michael Schroeder <mls@suse.de>
Date: Fri, 12 Mar 2010 11:20:36 +0000 (+0100)
Subject: - content: REPOTAGS -> REPOID, knownid GLOBALID -> REPOID
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~159^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a381a44ca8b6a48a308b3eff04bf05f8b0cda33e;p=thirdparty%2Flibsolv.git

- content: REPOTAGS -> REPOID, knownid GLOBALID -> REPOID
---

diff --git a/ext/repo_content.c b/ext/repo_content.c
index 2a19223a..e35bf6bf 100644
--- a/ext/repo_content.c
+++ b/ext/repo_content.c
@@ -280,9 +280,9 @@ repo_add_content(Repo *repo, FILE *fp, int flags)
           /* we also replicate some of them into the product solvables
            * to be backward compatible */
 
-	  if (istag ("REPOTAGS"))
+	  if (istag ("REPOID"))
 	    {
-	      repodata_add_poolstr_array(data, SOLVID_META, REPOSITORY_GLOBALID, value);
+	      repodata_add_poolstr_array(data, SOLVID_META, REPOSITORY_REPOID, value);
 	      continue;
 	    }
 
diff --git a/ext/repo_repomdxml.c b/ext/repo_repomdxml.c
index 18a080bc..193953d7 100644
--- a/ext/repo_repomdxml.c
+++ b/ext/repo_repomdxml.c
@@ -416,7 +416,7 @@ endElement(void *userData, const char *name)
       break;
     case STATE_REPO:
       if (pd->content)
-	repodata_add_poolstr_array(pd->data, SOLVID_META, REPOSITORY_GLOBALID, pd->content);
+	repodata_add_poolstr_array(pd->data, SOLVID_META, REPOSITORY_REPOID, pd->content);
       break;
     case STATE_SUSEINFO: break;
     case STATE_KEYWORDS: break;
diff --git a/src/knownid.h b/src/knownid.h
index 8ad7b8f0..1c322b77 100644
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -234,7 +234,7 @@ KNOWNID(PUBKEY_EXPIRES,		        "pubkey:expires"),
 KNOWNID(PUBKEY_SIGNATURES,	        "pubkey:signatures"),
 
 KNOWNID(REPOSITORY_TOOLVERSION,		"repository:toolversion"),
-KNOWNID(REPOSITORY_GLOBALID,		"repository:globalid"),
+KNOWNID(REPOSITORY_REPOID,		"repository:repoid"),
 
 KNOWNID(ID_NUM_INTERNAL,		0)