With the new code SEARCH_COMPLETE_FILELIST is the default.

We may add a SEARCH_FILTERED_FILELIST flag in the future if
there is a use case.

diff --git a/TODO_1.0 b/TODO_1.0
index 13000fcbbb7a5c455954eceea687fa92f2f8efd9..8a7bed249f83082554c37ea526da8eb58c33b2dd 100644 (file)
--- a/TODO_1.0
+++ b/TODO_1.0
@@ -26,3 +26,4 @@
 
 IDEAS:
 
+drop SEARCH_FILES and add SEARCH_BASENAME instead?

diff --git a/src/dataiterator.h b/src/dataiterator.h
index 3133686b0ed4c5b47f45ed54c0f170fb3a1c1d95..9c1d94a60d553a94dccc1d9c569883239fd3f4c7 100644 (file)
--- a/src/dataiterator.h
+++ b/src/dataiterator.h
@@ -52,7 +52,7 @@ typedef struct _KeyValue {
 #define SEARCH_SUB                     (1<<9)
 #define SEARCH_ARRAYSENTINEL           (1<<10)
 #define SEARCH_DISABLED_REPOS          (1<<11)
-#define SEARCH_COMPLETE_FILELIST       (1<<12)
+#define SEARCH_COMPLETE_FILELIST       (1<<12)         /* ignored, this is the default */
 
 /* stringification flags */
 #define SEARCH_SKIP_KIND               (1<<16)

diff --git a/src/pool.c b/src/pool.c
index 60cc0f49c7dbfc7da8edb1c44e996ce55c3cc117..3ff5bd20d2561638f5a877b2206bbefc68b8d49f 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -927,7 +927,7 @@ pool_addstdproviders(Pool *pool, Id d)
       return 1;
     }
   queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf));
-  dataiterator_init(&di, pool, 0, 0, SOLVABLE_FILELIST, str, SEARCH_STRING|SEARCH_FILES|SEARCH_COMPLETE_FILELIST);
+  dataiterator_init(&di, pool, 0, 0, SOLVABLE_FILELIST, str, SEARCH_STRING|SEARCH_FILES);
   for (; dataiterator_step(&di); dataiterator_skip_solvable(&di))
     {
       Solvable *s = pool->solvables + di.solvid;

diff --git a/src/selection.c b/src/selection.c
index d44c4829f928f037da8c72401e4f44b73215ee68..f0422d4f6fd8f278214878b1a697a4cb37cd480a 100644 (file)
--- a/src/selection.c
+++ b/src/selection.c
@@ -940,7 +940,7 @@ selection_filelist(Pool *pool, Queue *selection, const char *name, int flags)
   if ((flags & SELECTION_NOCASE) != 0)
     type |= SEARCH_NOCASE;
   queue_init(&q);
-  dataiterator_init(&di, pool, flags & SELECTION_INSTALLED_ONLY ? pool->installed : 0, 0, SOLVABLE_FILELIST, name, type|SEARCH_FILES|SEARCH_COMPLETE_FILELIST);
+  dataiterator_init(&di, pool, flags & SELECTION_INSTALLED_ONLY ? pool->installed : 0, 0, SOLVABLE_FILELIST, name, type|SEARCH_FILES);
   while (dataiterator_step(&di))
     {
       Solvable *s = pool->solvables + di.solvid;