X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fselection.c;h=37c618489a03b06a42f9da4044379f261cd6f063;hb=22e701e553344eeb22f88ed0906d76c9a5e39d83;hp=a2dd31b60cb7ed01c892b97401a5b0acfce3269b;hpb=75941c2115f0e8ec9696de2a22198a1969aaef77;p=platform%2Fupstream%2Flibsolv.git

diff --git a/src/selection.c b/src/selection.c
index a2dd31b..37c6184 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -53,8 +53,10 @@ selection_prune(Pool *pool, Queue *selection)
 	  Solvable *s;
 	  Repo *repo = pool_id2repo(pool, selection->elements[i + 1]);
 	  if (repo)
-	    FOR_REPO_SOLVABLES(repo, p, s)
-	      break;
+	    {
+	      FOR_REPO_SOLVABLES(repo, p, s)
+	        break;
+	    }
 	}
       else
 	{
@@ -96,8 +98,10 @@ selection_solvables(Pool *pool, Queue *selection, Queue *pkgs)
 	  Solvable *s;
 	  Repo *repo = pool_id2repo(pool, selection->elements[i + 1]);
 	  if (repo)
-	    FOR_REPO_SOLVABLES(repo, p, s)
-	      queue_push(pkgs, p);
+	    {
+	      FOR_REPO_SOLVABLES(repo, p, s)
+	        queue_push(pkgs, p);
+	    }
 	}
       else
 	{
@@ -279,7 +283,7 @@ selection_filter_installed(Pool *pool, Queue *selection)
 	}
       if (select)
 	{
-	  selection->elements[j++] = select | (selection->elements[i] & ~SOLVER_SELECTMASK);
+	  selection->elements[j++] = select | (selection->elements[i] & ~SOLVER_SELECTMASK) | SOLVER_SETREPO;
 	  selection->elements[j++] = id;
 	}
     }
@@ -335,12 +339,85 @@ selection_addsrc(Pool *pool, Queue *selection, int flags)
   queue_free(&q);
 }
 
+static inline const char *
+skipkind(const char *n)
+{
+  const char *s;
+  for (s = n; *s >= 'a' && *s <= 'z'; s++)
+    ;
+  if (*s == ':' && s != n)
+     return s + 1;
+  return n;
+}
+
+static inline void
+queue_pushunique2(Queue *q, Id id1, Id id2)
+{
+  int i;
+  for (i = 0; i < q->count; i += 2)
+    if (q->elements[i] == id1 && q->elements[i + 1] == id2)
+      return;
+  queue_push2(q, id1, id2);
+}
+
+static int
+selection_depglob_id(Pool *pool, Queue *selection, Id id, int flags)
+{
+  Id p, pp;
+  int match = 0;
+
+  FOR_PROVIDES(p, pp, id)
+    {
+      Solvable *s = pool->solvables + p;
+      if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed)
+	continue;
+      match = 1;
+      if (s->name == id && (flags & SELECTION_NAME) != 0)
+	{
+	  if ((flags & SELECTION_SOURCE_ONLY) != 0)
+	    id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1);
+	  queue_push2(selection, SOLVER_SOLVABLE_NAME, id);
+	  if ((flags & SELECTION_WITH_SOURCE) != 0)
+	    selection_addsrc(pool, selection, flags);
+	  return SELECTION_NAME;
+	}
+    }
+  if ((flags & (SELECTION_SOURCE_ONLY | SELECTION_WITH_SOURCE)) != 0 && (flags & SELECTION_NAME) != 0)
+    {
+      /* src rpms don't have provides, so we must check every solvable */
+      FOR_POOL_SOLVABLES(p)	/* slow path */
+	{
+	  Solvable *s = pool->solvables + p;
+	  if (s->name == id && (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC))
+	    {
+	      if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed)
+		continue;	/* just in case... src rpms can't be installed */
+	      if (pool_disabled_solvable(pool, s))
+		continue;
+	      if ((flags & SELECTION_SOURCE_ONLY) != 0)
+		id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1);
+	      queue_push2(selection, SOLVER_SOLVABLE_NAME, id);
+	      if ((flags & SELECTION_WITH_SOURCE) != 0)
+		selection_addsrc(pool, selection, flags);
+	      return SELECTION_NAME;
+	    }
+	}
+    }
+  if (match && (flags & SELECTION_PROVIDES) != 0)
+    {
+      queue_push2(selection, SOLVER_SOLVABLE_PROVIDES, id);
+      return SELECTION_PROVIDES;
+    }
+  return 0;
+}
+
 static int
 selection_depglob(Pool *pool, Queue *selection, const char *name, int flags)
 {
   Id id, p, pp;
-  int i, match = 0;
+  int match = 0;
   int doglob = 0;
+  int nocase = 0;
   int globflags = 0;
 
   if ((flags & SELECTION_SOURCE_ONLY) != 0)
@@ -355,121 +432,56 @@ selection_depglob(Pool *pool, Queue *selection, const char *name, int flags)
   if ((flags & SELECTION_INSTALLED_ONLY) != 0 && !pool->installed)
     return 0;
 
-  if (!(flags & SELECTION_NOCASE))
+  nocase = flags & SELECTION_NOCASE;
+  if (!nocase && !(flags & SELECTION_SKIP_KIND))
     {
       id = pool_str2id(pool, name, 0);
       if (id)
 	{
-	  if ((flags & (SELECTION_SOURCE_ONLY | SELECTION_WITH_SOURCE)) != 0 && (flags & SELECTION_NAME) != 0)
-	    {
-	      /* src rpms don't have provides, so we must check every solvable */
-	      FOR_PROVIDES(p, pp, id)	/* try fast path first */
-		{
-		  Solvable *s = pool->solvables + p;
-		  if (s->name == id)
-		    {
-		      if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed)
-			continue;
-		      if ((flags & SELECTION_SOURCE_ONLY) != 0)
-		        id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1);
-		      queue_push2(selection, SOLVER_SOLVABLE_NAME, id);
-		      if ((flags & SELECTION_WITH_SOURCE) != 0)
-			selection_addsrc(pool, selection, flags);
-		      return SELECTION_NAME;
-		    }
-		}
-	      FOR_POOL_SOLVABLES(p)	/* slow path */
-		{
-		  Solvable *s = pool->solvables + p;
-		  if (s->name == id && (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC))
-		    {
-		      if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed)
-			continue;	/* just in case... src rpms can't be installed */
-		      if (pool_disabled_solvable(pool, s))
-			continue;
-		      if ((flags & SELECTION_SOURCE_ONLY) != 0)
-		        id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1);
-		      queue_push2(selection, SOLVER_SOLVABLE_NAME, id);
-		      if ((flags & SELECTION_WITH_SOURCE) != 0)
-			selection_addsrc(pool, selection, flags);
-		      return SELECTION_NAME;
-		    }
-		}
-	    }
-	  FOR_PROVIDES(p, pp, id)
-	    {
-	      Solvable *s = pool->solvables + p;
-	      if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed)
-		continue;
-	      match = 1;
-	      if (s->name == id && (flags & SELECTION_NAME) != 0)
-		{
-		  if ((flags & SELECTION_SOURCE_ONLY) != 0)
-		    id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1);
-		  queue_push2(selection, SOLVER_SOLVABLE_NAME, id);
-		  if ((flags & SELECTION_WITH_SOURCE) != 0)
-		    selection_addsrc(pool, selection, flags);
-		  return SELECTION_NAME;
-		}
-	    }
-	  if (match && (flags & SELECTION_PROVIDES) != 0)
-	    {
-	      queue_push2(selection, SOLVER_SOLVABLE_PROVIDES, id);
-	      return SELECTION_PROVIDES;
-	    }
+	  /* the id is know, do the fast id matching using the whatprovides lookup */
+	  int ret = selection_depglob_id(pool, selection, id, flags);
+	  if (ret)
+	    return ret;
 	}
     }
 
   if ((flags & SELECTION_GLOB) != 0 && strpbrk(name, "[*?") != 0)
     doglob = 1;
 
-  if (!doglob && !(flags & SELECTION_NOCASE))
-    return 0;
+  if (!nocase && !(flags & SELECTION_SKIP_KIND) && !doglob)
+    return 0;	/* all done above in depglob_id */
 
-  if (doglob && (flags & SELECTION_NOCASE) != 0)
+  if (doglob && nocase)
     globflags = FNM_CASEFOLD;
 
-#if 0	/* doesn't work with selection_filter_rel yet */
-  if (doglob && !strcmp(name, "*") && (flags & SELECTION_FLAT) != 0)
-    {
-      /* can't do this for SELECTION_PROVIDES, as src rpms don't provide anything */
-      if ((flags & SELECTION_NAME) != 0)
-	{
-	  queue_push2(selection, SOLVER_SOLVABLE_ALL, 0);
-          return SELECTION_NAME;
-	}
-    }
-#endif
-
   if ((flags & SELECTION_NAME) != 0)
     {
       /* looks like a name glob. hard work. */
       FOR_POOL_SOLVABLES(p)
-        {
-          Solvable *s = pool->solvables + p;
-          if (s->repo != pool->installed && !pool_installable(pool, s))
+	{
+	  Solvable *s = pool->solvables + p;
+	  const char *n;
+	  if (s->repo != pool->installed && !pool_installable(pool, s))
 	    {
 	      if (!(flags & SELECTION_SOURCE_ONLY) || (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC))
-                continue;
+		continue;
 	      if (pool_disabled_solvable(pool, s))
 		continue;
 	    }
 	  if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed)
 	    continue;
-          id = s->name;
-          if ((doglob ? fnmatch(name, pool_id2str(pool, id), globflags) : strcasecmp(name, pool_id2str(pool, id))) == 0)
-            {
+	  id = s->name;
+	  n = pool_id2str(pool, id);
+	  if (flags & SELECTION_SKIP_KIND)
+	    n = skipkind(n);
+	  if ((doglob ? fnmatch(name, n, globflags) : nocase ? strcasecmp(name, n) : strcmp(name, n)) == 0)
+	    {
 	      if ((flags & SELECTION_SOURCE_ONLY) != 0)
 		id = pool_rel2id(pool, id, ARCH_SRC, REL_ARCH, 1);
-	      /* queue_pushunique2 */
-              for (i = 0; i < selection->count; i += 2)
-                if (selection->elements[i] == SOLVER_SOLVABLE_NAME && selection->elements[i + 1] == id)
-                  break;
-              if (i == selection->count)
-                queue_push2(selection, SOLVER_SOLVABLE_NAME, id);
-              match = 1;
-            }
-        }
+	      queue_pushunique2(selection, SOLVER_SOLVABLE_NAME, id);
+	      match = 1;
+	    }
+	}
       if (match)
 	{
 	  if ((flags & SELECTION_WITH_SOURCE) != 0)
@@ -477,15 +489,18 @@ selection_depglob(Pool *pool, Queue *selection, const char *name, int flags)
           return SELECTION_NAME;
 	}
     }
+
   if ((flags & SELECTION_PROVIDES))
     {
       /* looks like a dep glob. really hard work. */
       for (id = 1; id < pool->ss.nstrings; id++)
-        {
-          if (!pool->whatprovides[id] || pool->whatprovides[id] == 1)
-            continue;
-          if ((doglob ? fnmatch(name, pool_id2str(pool, id), globflags) : strcasecmp(name, pool_id2str(pool, id))) == 0)
-            {
+	{
+	  const char *n;
+	  if (!pool->whatprovides[id] || pool->whatprovides[id] == 1)
+	    continue;
+	  n = pool_id2str(pool, id);
+	  if ((doglob ? fnmatch(name, n, globflags) : nocase ? strcasecmp(name, n) : strcmp(name, n)) == 0)
+	    {
 	      if ((flags & SELECTION_INSTALLED_ONLY) != 0)
 		{
 		  FOR_PROVIDES(p, pp, id)
@@ -495,9 +510,9 @@ selection_depglob(Pool *pool, Queue *selection, const char *name, int flags)
 		    continue;
 		}
 	      queue_push2(selection, SOLVER_SOLVABLE_PROVIDES, id);
-              match = 1;
-            }
-        }
+	      match = 1;
+	    }
+	}
       if (match)
         return SELECTION_PROVIDES;
     }
@@ -540,6 +555,14 @@ selection_filelist(Pool *pool, Queue *selection, const char *name, int flags)
   Queue q;
   int type;
 
+  /* all files in the file list start with a '/' */
+  if (*name != '/')
+    {
+      if (!(flags & SELECTION_GLOB))
+	return 0;
+      if (*name != '*' && *name != '[' && *name != '?')
+	return 0;
+    }
   type = !(flags & SELECTION_GLOB) || strpbrk(name, "[*?") == 0 ? SEARCH_STRING : SEARCH_GLOB;
   if ((flags & SELECTION_NOCASE) != 0)
     type |= SEARCH_NOCASE;
@@ -565,7 +588,7 @@ selection_filelist(Pool *pool, Queue *selection, const char *name, int flags)
   dataiterator_free(&di);
   if (!q.count)
     return 0;
-  if (q.count > 1) 
+  if (q.count > 1)
     queue_push2(selection, SOLVER_SOLVABLE_ONE_OF, pool_queuetowhatprovides(pool, &q));
   else
     queue_push2(selection, SOLVER_SOLVABLE | SOLVER_NOAUTOSET, q.elements[0]);
@@ -578,19 +601,19 @@ splitrel(char *rname, char *r, int *rflagsp)
 {
   int nend = r - rname;
   int rflags = 0;
-  if (nend && *r == '=' && r[-1] == '!') 
+  if (nend && *r == '=' && r[-1] == '!')
     {
       nend--;
       r++;
       rflags = REL_LT|REL_GT;
     }
-  for (; *r; r++) 
+  for (; *r; r++)
     {
-      if (*r == '<') 
+      if (*r == '<')
 	rflags |= REL_LT;
-      else if (*r == '=') 
+      else if (*r == '=')
 	rflags |= REL_EQ;
-      else if (*r == '>') 
+      else if (*r == '>')
 	rflags |= REL_GT;
       else
 	break;
@@ -599,10 +622,10 @@ splitrel(char *rname, char *r, int *rflagsp)
     r++;
   while (nend && (rname[nend - 1] == ' ' || rname[nend - 1] == '\t'))
     nend--;
-  if (!*rname || !*r) 
+  if (!*rname || !*r)
     return 0;
   *rflagsp = rflags;
-  rname[nend] = 0; 
+  rname[nend] = 0;
   return r;
 }
 
@@ -611,7 +634,7 @@ selection_rel(Pool *pool, Queue *selection, const char *name, int flags)
 {
   int ret, rflags = 0;
   char *r, *rname;
-  
+
   /* relation case, support:
    * depglob rel
    * depglob.arch rel
@@ -792,7 +815,7 @@ selection_canon(Pool *pool, Queue *selection, const char *name, int flags)
     return 0;
   rname = solv_strdup(name);	/* so we can modify it */
   r = rname + (r - name);
-  *r = 0; 
+  *r = 0;
 
   /* split off potential arch part from version */
   if ((r2 = strrchr(r + 1, '.')) != 0 && r2[1] && (archid = str2archid(pool, r2 + 1)) != 0)
@@ -809,8 +832,8 @@ selection_canon(Pool *pool, Queue *selection, const char *name, int flags)
 	  solv_free(rname);
 	  return 0;
 	}
-      *r = '-'; 
-      *r2 = 0; 
+      *r = '-';
+      *r2 = 0;
       r = r2;
       if ((ret = selection_depglob(pool, selection, rname, flags)) == 0)
 	{
@@ -829,12 +852,11 @@ int
 selection_make(Pool *pool, Queue *selection, const char *name, int flags)
 {
   int ret = 0;
-  const char *r;
 
   queue_empty(selection);
-  if (*name == '/' && (flags & SELECTION_FILELIST))
+  if ((flags & SELECTION_FILELIST) != 0)
     ret = selection_filelist(pool, selection, name, flags);
-  if (!ret && (flags & SELECTION_REL) != 0 && (r = strpbrk(name, "<=>")) != 0)
+  if (!ret && (flags & SELECTION_REL) != 0 && strpbrk(name, "<=>") != 0)
     ret = selection_rel(pool, selection, name, flags);
   if (!ret)
     ret = selection_depglob_arch(pool, selection, name, flags);
@@ -849,17 +871,36 @@ selection_make(Pool *pool, Queue *selection, const char *name, int flags)
   return ret;
 }
 
+static inline int
+matchdep_str(const char *pattern, const char *string, int flags)
+{
+  if (flags & SELECTION_GLOB)
+    {
+      int globflags = (flags & SELECTION_NOCASE) != 0 ? FNM_CASEFOLD : 0;
+      return fnmatch(pattern, string, globflags) == 0 ? 1 : 0;
+    }
+  if (flags & SELECTION_NOCASE)
+    return strcasecmp(pattern, string) == 0 ? 1 : 0;
+  return strcmp(pattern, string) == 0 ? 1 : 0;
+}
+
 static int
 matchdep(Pool *pool, Id id, char *rname, int rflags, char *revr, int flags)
 {
   if (ISRELDEP(id))
     {
       Reldep *rd = GETRELDEP(pool, id);
-      if (rd->flags == REL_AND || rd->flags == REL_OR || rd->flags == REL_WITH)
+      if (rd->flags == REL_AND || rd->flags == REL_OR || rd->flags == REL_WITH || rd->flags == REL_COND)
 	{
 	  if (matchdep(pool, rd->name, rname, rflags, revr, flags))
 	    return 1;
-	  if (matchdep(pool, rd->evr, rname, rflags, revr, flags))
+	  if (rd->flags == REL_COND && ISRELDEP(rd->evr))
+	    {
+	      rd = GETRELDEP(pool, rd->evr);
+	      if (rd->flags != REL_ELSE)
+		return 0;
+	    }
+	  if (rd->flags != REL_COND && matchdep(pool, rd->evr, rname, rflags, revr, flags))
 	    return 1;
 	  return 0;
 	}
@@ -875,14 +916,7 @@ matchdep(Pool *pool, Id id, char *rname, int rflags, char *revr, int flags)
 	}
       return 1;
     }
-  if (flags & SELECTION_GLOB)
-    {
-      int globflags = (flags & SELECTION_NOCASE) != 0 ? FNM_CASEFOLD : 0;
-      return fnmatch(rname, pool_id2str(pool, id), globflags) == 0 ? 1 : 0;
-    }
-  if (flags & SELECTION_NOCASE)
-    return strcasecmp(rname, pool_id2str(pool, id)) == 0 ? 1 : 0;
-  return strcmp(rname, pool_id2str(pool, id)) == 0 ? 1 : 0;
+  return matchdep_str(rname, pool_id2str(pool, id), flags);
 }
 
 /*
@@ -893,22 +927,25 @@ matchdep(Pool *pool, Id id, char *rname, int rflags, char *revr, int flags)
 int
 selection_make_matchdeps(Pool *pool, Queue *selection, const char *name, int flags, int keyname, int marker)
 {
-  char *rname, *r;
+  char *rname, *r = 0;
   int rflags = 0;
   Id p;
   Queue q;
 
   queue_empty(selection);
   rname = solv_strdup(name);
-  if ((r = strpbrk(rname, "<=>")) != 0)
+  if (!(flags & SELECTION_MATCH_DEPSTR))
     {
-      if ((r = splitrel(rname, r, &rflags)) == 0)
+      if ((r = strpbrk(rname, "<=>")) != 0)
 	{
-	  solv_free(rname);
-	  return 0;
+	  if ((r = splitrel(rname, r, &rflags)) == 0)
+	    {
+	      solv_free(rname);
+	      return 0;
+	    }
 	}
     }
-  if ((flags & SELECTION_GLOB) != 0 && !strpbrk(name, "[*?") != 0)
+  if ((flags & SELECTION_GLOB) != 0 && !strpbrk(rname, "[*?") != 0)
     flags &= ~SELECTION_GLOB;
 
   queue_init(&q);
@@ -933,6 +970,12 @@ selection_make_matchdeps(Pool *pool, Queue *selection, const char *name, int fla
       for (i = 0; i < q.count; i++)
 	{
 	  Id id = q.elements[i];
+	  if ((flags & SELECTION_MATCH_DEPSTR) != 0)
+	    {
+	      if (matchdep_str(rname, pool_dep2str(pool, id), flags))
+		break;
+	      continue;
+	    }
 	  if (matchdep(pool, id, rname, rflags, r, flags))
 	    break;
 	}
@@ -940,6 +983,7 @@ selection_make_matchdeps(Pool *pool, Queue *selection, const char *name, int fla
 	queue_push2(selection, SOLVER_SOLVABLE | SOLVER_NOAUTOSET, p);
     }
   queue_free(&q);
+  solv_free(rname);
   if (!selection->count)
     return 0;
   if ((flags & SELECTION_FLAT) != 0)
@@ -947,11 +991,84 @@ selection_make_matchdeps(Pool *pool, Queue *selection, const char *name, int fla
   return SELECTION_PROVIDES;
 }
 
+int
+selection_make_matchdepid(Pool *pool, Queue *selection, Id dep, int flags, int keyname, int marker)
+{
+  Id p;
+  Queue q;
+
+  queue_empty(selection);
+  if (!dep)
+    return 0;
+  queue_init(&q);
+  FOR_POOL_SOLVABLES(p)
+    {
+      Solvable *s =  pool->solvables + p;
+      int i;
+
+      if (s->repo != pool->installed && !pool_installable(pool, s))
+	{
+	  if (!(flags & SELECTION_SOURCE_ONLY) || (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC))
+	    continue;
+	  if (pool_disabled_solvable(pool, s))
+	    continue;
+	}
+      if ((flags & SELECTION_INSTALLED_ONLY) != 0 && s->repo != pool->installed)
+	continue;
+      if ((s->arch == ARCH_SRC || s->arch == ARCH_NOSRC) && !(flags & SELECTION_SOURCE_ONLY) && !(flags & SELECTION_WITH_SOURCE))
+	continue;
+      queue_empty(&q);
+      repo_lookup_deparray(s->repo, p, keyname, &q, marker);
+      for (i = 0; i < q.count; i++)
+	{
+	  if ((flags & SELECTION_MATCH_DEPSTR) != 0)	/* mis-use */
+	    {
+	      if (q.elements[i] == dep)
+		break;
+	      continue;
+	    }
+	  if (pool_match_dep(pool, q.elements[i], dep))
+	    break;
+	}
+      if (i < q.count)
+	queue_push2(selection, SOLVER_SOLVABLE | SOLVER_NOAUTOSET, p);
+    }
+  queue_free(&q);
+  if (!selection->count)
+    return 0;
+  if ((flags & SELECTION_FLAT) != 0)
+    selection_flatten(pool, selection);
+  return SELECTION_PROVIDES;
+}
+
+static inline int
+pool_is_kind(Pool *pool, Id name, Id kind)
+{
+  const char *n;
+  if (!kind)
+    return 1;
+  n = pool_id2str(pool, name);
+  if (kind != 1)
+    {
+      const char *kn = pool_id2str(pool, kind);
+      int knl = strlen(kn);
+      return !strncmp(n, kn, knl) && n[knl] == ':' ? 1 : 0;
+    }
+  else
+    {
+      if (*n == ':')
+        return 1;
+      while(*n >= 'a' && *n <= 'z')
+        n++;
+      return *n == ':' ? 0 : 1;
+    }
+}
+
 void
 selection_filter(Pool *pool, Queue *sel1, Queue *sel2)
 {
   int i, j, miss;
-  Id p, pp;
+  Id p, pp, q1filled = 0;
   Queue q1;
   Map m2;
   Id setflags = 0;
@@ -964,8 +1081,11 @@ selection_filter(Pool *pool, Queue *sel1, Queue *sel2)
   if (sel1->count == 2 && (sel1->elements[0] & SOLVER_SELECTMASK) == SOLVER_SOLVABLE_ALL)
     {
       /* XXX: not 100% correct, but very useful */
+      p = sel1->elements[0] & ~(SOLVER_SELECTMASK | SOLVER_SETMASK);	/* job & jobflags */
       queue_free(sel1);
       queue_init_clone(sel1, sel2);
+      for (i = 0; i < sel1->count; i += 2)
+        sel1->elements[i] = (sel1->elements[i] & (SOLVER_SELECTMASK | SOLVER_SETMASK)) | p ;
       return;
     }
   queue_init(&q1);
@@ -984,11 +1104,45 @@ selection_filter(Pool *pool, Queue *sel1, Queue *sel2)
 	  Solvable *s;
 	  Repo *repo = pool_id2repo(pool, sel2->elements[i + 1]);
 	  if (repo)
-	    FOR_REPO_SOLVABLES(repo, p, s)
-	      map_set(&m2, p);
+	    {
+	      FOR_REPO_SOLVABLES(repo, p, s)
+	        map_set(&m2, p);
+	    }
 	}
       else
 	{
+	  if ((select == SOLVER_SOLVABLE_NAME || select == SOLVER_SOLVABLE_PROVIDES) && ISRELDEP(sel2->elements[i + 1]))
+	    {
+	      Reldep *rd = GETRELDEP(pool, sel2->elements[i + 1]);
+	      if (rd->flags == REL_ARCH && rd->name == 0)
+		{
+		  /* special arch filter */
+		  if (!q1filled++)
+		    selection_solvables(pool, sel1, &q1);
+		  for (j = 0; j < q1.count; j++)
+		    {
+		      Id p = q1.elements[j];
+		      Solvable *s = pool->solvables + p;
+		      if (s->arch == rd->evr || (rd->evr == ARCH_SRC && s->arch == ARCH_NOSRC))
+		        map_set(&m2, p);
+		    }
+		  continue;
+		}
+	      else if (rd->flags == REL_KIND && rd->name == 0)
+		{
+		  /* special kind filter */
+		  if (!q1filled++)
+		    selection_solvables(pool, sel1, &q1);
+		  for (j = 0; j < q1.count; j++)
+		    {
+		      Id p = q1.elements[j];
+		      Solvable *s = pool->solvables + p;
+		      if (pool_is_kind(pool, s->name, rd->evr))
+		        map_set(&m2, p);
+		    }
+		  continue;
+		}
+	    }
 	  FOR_JOB_SELECT(p, pp, select, sel2->elements[i + 1])
 	    map_set(&m2, p);
 	}
@@ -1015,13 +1169,15 @@ selection_filter(Pool *pool, Queue *sel1, Queue *sel2)
 	  Solvable *s;
 	  Repo *repo = pool_id2repo(pool, sel1->elements[i + 1]);
 	  if (repo)
-	    FOR_REPO_SOLVABLES(repo, p, s)
-	      {
-	        if (map_tst(&m2, p))
-	          queue_push(&q1, p);
-	        else
-	          miss = 1;
-	      }
+	    {
+	      FOR_REPO_SOLVABLES(repo, p, s)
+		{
+		  if (map_tst(&m2, p))
+		    queue_push(&q1, p);
+		  else
+		    miss = 1;
+		}
+	    }
 	}
       else
 	{
@@ -1040,7 +1196,7 @@ selection_filter(Pool *pool, Queue *sel1, Queue *sel2)
 	  sel1->elements[j] = sel1->elements[i] | setflags;
 	  sel1->elements[j + 1] = sel1->elements[i + 1];
 	}
-      else if (q1.count > 1) 
+      else if (q1.count > 1)
 	{
 	  sel1->elements[j] = (sel1->elements[i] & ~SOLVER_SELECTMASK) | SOLVER_SOLVABLE_ONE_OF | setflags;
 	  sel1->elements[j + 1] = pool_queuetowhatprovides(pool, &q1);