From: Michael Schroeder <mls@suse.de>
Date: Mon, 2 Apr 2012 09:48:21 +0000 (+0200)
Subject: - "noarch" is called "any" on archlinux, so now we have noarch/all/any ;(
X-Git-Tag: BASE-SuSE-Code-12_2-Branch~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab13d4e340f60848879a06b060d0bbe702d76092;p=thirdparty%2Flibsolv.git

- "noarch" is called "any" on archlinux, so now we have noarch/all/any ;(
---

diff --git a/ext/repo_arch.c b/ext/repo_arch.c
index 8476de97..b8c88ccf 100644
--- a/ext/repo_arch.c
+++ b/ext/repo_arch.c
@@ -430,7 +430,7 @@ repo_add_arch_pkg(Repo *repo, const char *fn, int flags)
   if (s)
     {
       if (!s->arch)
-	s->arch = ARCH_NOARCH;
+	s->arch = ARCH_ANY;
       if (!s->evr)
 	s->evr = ID_EMPTY;
       s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
@@ -586,7 +586,7 @@ repo_add_arch_repo(Repo *repo, FILE *fp, int flags)
 	      if (s)
 		{
 		  if (!s->arch)
-		    s->arch = ARCH_NOARCH;
+		    s->arch = ARCH_ANY;
 		  if (!s->evr)
 		    s->evr = ID_EMPTY;
 		  s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
@@ -771,7 +771,7 @@ repo_add_arch_repo(Repo *repo, FILE *fp, int flags)
       if (s)
 	{
 	  if (!s->arch)
-	    s->arch = ARCH_NOARCH;
+	    s->arch = ARCH_ANY;
 	  if (!s->evr)
 	    s->evr = ID_EMPTY;
 	  s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
diff --git a/src/knownid.h b/src/knownid.h
index 568f3013..655657e5 100644
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -242,6 +242,8 @@ KNOWNID(SUSETAGS_SHARE_NAME,		"susetags:share:name"),
 KNOWNID(SUSETAGS_SHARE_EVR,		"susetags:share:evr"),
 KNOWNID(SUSETAGS_SHARE_ARCH,		"susetags:share:arch"),
 
+KNOWNID(ARCH_ANY,			"any"),
+
 KNOWNID(ID_NUM_INTERNAL,		0)
 
 #ifdef KNOWNID_INITIALIZE
diff --git a/src/poolarch.c b/src/poolarch.c
index fd10910d..e41f7d11 100644
--- a/src/poolarch.c
+++ b/src/poolarch.c
@@ -149,7 +149,7 @@ pool_arch2color_slow(Pool *pool, Id arch)
   if (!pool->id2color)
     pool->id2color = solv_calloc(pool->lastarch + 1, 1);
   s = pool_id2str(pool, arch);
-  if (arch == ARCH_NOARCH || arch == ARCH_ALL)
+  if (arch == ARCH_NOARCH || arch == ARCH_ALL || arch == ARCH_ANY)
     color = ARCHCOLOR_ALL;
   else if (!strcmp(s, "s390x") || strstr(s, "64"))
     color = ARCHCOLOR_64;