From: Michael Schroeder <mls@suse.de>
Date: Thu, 9 Oct 2008 13:24:21 +0000 (+0000)
Subject: - kill SEARCH_EXTRA so we see where libzypp has to be changed
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2da1ef79fdc2918c88a63fc5d466a6c9bfb5d822;p=thirdparty%2Flibsolv.git

- kill SEARCH_EXTRA so we see where libzypp has to be changed
---

diff --git a/src/repo.h b/src/repo.h
index 8cef8bb7..0e4ec943 100644
--- a/src/repo.h
+++ b/src/repo.h
@@ -39,7 +39,6 @@ typedef struct _Repo {
   int start;			/* start of this repo solvables within pool->solvables */
   int end;			/* last solvable + 1 of this repo */
   int nsolvables;		/* number of solvables repo is contributing to pool */
-  int nextra;			/* number of extra objects (non-solvables) */
 
   int priority;			/* priority of this repo */
 
@@ -168,7 +167,6 @@ typedef struct _KeyValue {
 
 #define	SEARCH_NOCASE			(1<<8)
 #define	SEARCH_NO_STORAGE_SOLVABLE	(1<<9)
-#define SEARCH_EXTRA			(1<<10)
 #define SEARCH_SUB			(1<<10)
 #define SEARCH_ALL_REPOS		(1<<11)
 #define SEARCH_SKIP_KIND		(1<<12)
diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c
index 9ae443d6..a5314f3a 100644
--- a/tools/dumpsolv.c
+++ b/tools/dumpsolv.c
@@ -300,7 +300,7 @@ int main(int argc, char **argv)
       repo = pool->repos[j];
       dump_repodata(repo);
 
-      printf("repo %d contains %d solvables %d non-solvables\n", j, repo->nsolvables, repo->nextra);
+      printf("repo %d contains %d solvables\n", j, repo->nsolvables);
       printf("repo start: %d end: %d\n", repo->start, repo->end);
       for (i = repo->start, n = 1; i < repo->end; i++)
 	{
@@ -332,6 +332,7 @@ int main(int argc, char **argv)
 #endif
 	  n++;
 	}
+#if 0
       for (i = 0; i < repo->nextra; i++)
 	{
 	  printf("\nextra %d:\n", i);
@@ -340,6 +341,7 @@ int main(int argc, char **argv)
 	  while (dataiterator_step(&di))
 	    dump_attr(repo, di.data, di.key, &di.kv);
 	}
+#endif
 #if 0
       tryme(repo, 0, SOLVABLE_MEDIANR, 0, 0);
       printf("\n");