- "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 8476de9..b8c88cc 100644 (file)
--- 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 568f301..655657e 100644 (file)
--- 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 fd10910..e41f7d1 100644 (file)
--- 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;