Revert the testcase meta commits

The libzypp folks will use an extraa file to store their meta
data, so we do not need the changes for now.

We can revive them later if we need them again.

diff --git a/ext/repo_testcase.c b/ext/repo_testcase.c
index 8c4ac681b7f8928e473f4dafb235c33bb2f92dca..5cc03271458ff051da38a5cc1b245e2214cd2d7c 100644 (file)
--- a/ext/repo_testcase.c
+++ b/ext/repo_testcase.c
@@ -432,23 +432,6 @@ testcase_write_testtags(Repo *repo, FILE *fp)
   Queue q;
 
   fprintf(fp, "=Ver: 3.0\n");
-  if (repo_lookup_type(repo, SOLVID_META, REPOSITORY_TESTCASE_META))
-   {
-     Dataiterator di;
-     dataiterator_init(&di, pool, repo, SOLVID_META, 0, 0, 0);
-     dataiterator_prepend_keyname(&di, REPOSITORY_TESTCASE_META);
-     while (dataiterator_step(&di))
-       {
-        const char *value = repodata_stringify(pool, di.data, di.key, &di.kv, di.flags);
-        if (!value)
-          continue;
-        if (strchr(value, '\n'))
-          continue;
-        fprintf(fp, "=Met: %s \"%s\"\n", pool_id2str(pool, di.key->name), value);
-       }
-     dataiterator_free(&di);
-   }
-
   queue_init(&q);
   FOR_REPO_SOLVABLES(repo, p, s)
     {
@@ -554,7 +537,6 @@ testcase_add_testtags(Repo *repo, FILE *fp, int flags)
   int nfilelist = 0;
   int tagsversion = 0;
   int addselfprovides = 1;     /* for compat reasons */
-  Id metah = 0;
 
   data = repo_add_repodata(repo, flags);
   s = 0;
@@ -628,19 +610,6 @@ testcase_add_testtags(Repo *repo, FILE *fp, int flags)
          s->evr = makeevr(pool, sp[1]);
          s->arch = strcmp(sp[3], "-") ? pool_str2id(pool, sp[3], 1) : 0;
          continue;
-       case 'M' << 16 | 'e' << 8 | 't':
-         if (split(line + 5, sp, 2) != 2 || !sp[0][0])
-           break;
-         if (sp[1][0] != '"' || !sp[1][1] || sp[1][strlen(sp[1]) - 1] != '"')
-           break;
-         sp[1][strlen(sp[1]) - 1] = 0;
-         if (!metah)
-           {
-             metah = repodata_new_handle(data);
-             repodata_add_flexarray(data, SOLVID_META, REPOSITORY_TESTCASE_META, metah);
-           }
-         repodata_set_str(data, metah, pool_str2id(pool, sp[0], 1), sp[1] + 1);
-         break;
        default:
          break;
        }

diff --git a/ext/testcase.c b/ext/testcase.c
index 250375040b62cbdbedb388634efc273a79a7e986..16727068fc62fc9defdd9b1c3e7c921c7f1841b3 100644 (file)
--- a/ext/testcase.c
+++ b/ext/testcase.c
@@ -1233,28 +1233,6 @@ dump_genid(Pool *pool, Strqueue *sq, Id id, int cnt)
   return cnt;
 }
 
-/* convenience: add comments with the meta data */
-static void
-dump_repo_meta(Pool *pool, Strqueue *sq, Repo *repo)
-{
-  Dataiterator di;
-  dataiterator_init(&di, pool, repo, SOLVID_META, 0, 0, 0);
-  dataiterator_prepend_keyname(&di, REPOSITORY_TESTCASE_META);
-  char *line;
-
-  while (dataiterator_step(&di))
-    {
-      const char *key = pool_id2str(pool, di.key->name);
-      const char *value = repodata_stringify(pool, di.data, di.key, &di.kv, di.flags);
-      if (!key || !value || strchr(key, '\n') != 0 || strchr(value, '\n') != 0)
-        continue;
-      line = pool_tmpjoin(pool, "# ", key, 0);
-      line = pool_tmpappend(pool, line, " ", value);
-      strqueue_push(sq, line);
-    }
-  dataiterator_free(&di);
-}
-
 char *
 testcase_solverresult(Solver *solv, int resultflags)
 {
@@ -1626,14 +1604,12 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
 #else
   if (mkdir(dir, 0777) && errno != EEXIST)
 #endif
-    return pool_error(pool, 0, "testcase_write: could not create directory '%s'", dir);
+    return pool_error(solv->pool, 0, "testcase_write: could not create directory '%s'", dir);
   strqueue_init(&sq);
   FOR_REPOS(repoid, repo)
     {
       const char *name = testcase_repoid2str(pool, repoid);
       char priobuf[50];
-      if (repo_lookup_type(repo, SOLVID_META, REPOSITORY_TESTCASE_META))
-        dump_repo_meta(pool, &sq, repo);
       if (repo->subpriority)
        sprintf(priobuf, "%d.%d", repo->priority, repo->subpriority);
       else
@@ -1653,14 +1629,14 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
       out = pool_tmpjoin(pool, dir, "/", out);
       if (!(fp = solv_xfopen(out, "w")))
        {
-         pool_error(pool, 0, "testcase_write: could not open '%s' for writing", out);
+         pool_error(solv->pool, 0, "testcase_write: could not open '%s' for writing", out);
          strqueue_free(&sq);
          return 0;
        }
       testcase_write_testtags(repo, fp);
       if (fclose(fp))
        {
-         pool_error(pool, 0, "testcase_write: write error");
+         pool_error(solv->pool, 0, "testcase_write: write error");
          strqueue_free(&sq);
          return 0;
        }
@@ -1686,7 +1662,7 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
   if (pool->installed)
     cmd = pool_tmpappend(pool, cmd, " ", testcase_repoid2str(pool, pool->installed->repoid));
   strqueue_push(&sq, cmd);
-  s = testcase_getpoolflags(pool);
+  s = testcase_getpoolflags(solv->pool);
   if (*s)
     {
       cmd = pool_tmpjoin(pool, "poolflags ", s, 0);
@@ -1783,14 +1759,14 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
          out = pool_tmpjoin(pool, dir, "/", resultname);
          if (!(fp = fopen(out, "w")))
            {
-             pool_error(pool, 0, "testcase_write: could not open '%s' for writing", out);
+             pool_error(solv->pool, 0, "testcase_write: could not open '%s' for writing", out);
              solv_free(result);
              strqueue_free(&sq);
              return 0;
            }
          if (result && *result && fwrite(result, strlen(result), 1, fp) != 1)
            {
-             pool_error(pool, 0, "testcase_write: write error");
+             pool_error(solv->pool, 0, "testcase_write: write error");
              solv_free(result);
              strqueue_free(&sq);
              fclose(fp);
@@ -1798,7 +1774,7 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
            }
          if (fclose(fp))
            {
-             pool_error(pool, 0, "testcase_write: write error");
+             pool_error(solv->pool, 0, "testcase_write: write error");
              solv_free(result);
              strqueue_free(&sq);
              return 0;
@@ -1812,20 +1788,20 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha
   out = pool_tmpjoin(pool, dir, "/", testcasename);
   if (!(fp = fopen(out, "w")))
     {
-      pool_error(pool, 0, "testcase_write: could not open '%s' for writing", out);
+      pool_error(solv->pool, 0, "testcase_write: could not open '%s' for writing", out);
       solv_free(result);
       return 0;
     }
   if (*result && fwrite(result, strlen(result), 1, fp) != 1)
     {
-      pool_error(pool, 0, "testcase_write: write error");
+      pool_error(solv->pool, 0, "testcase_write: write error");
       solv_free(result);
       fclose(fp);
       return 0;
     }
   if (fclose(fp))
     {
-      pool_error(pool, 0, "testcase_write: write error");
+      pool_error(solv->pool, 0, "testcase_write: write error");
       solv_free(result);
       return 0;
     }

diff --git a/src/knownid.h b/src/knownid.h
index 07b3a9c2ceb717a67e09886cd7646adcdb6433f2..4c1730b579f16789cec6302ecb16bbc1dcca6cde 100644 (file)
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -268,8 +268,6 @@ KNOWNID(LIBSOLV_SELF_DESTRUCT_PKG,      "libsolv-self-destruct-pkg()"),     /* this
 KNOWNID(SOLVABLE_CONSTRAINS,           "solvable:constrains"),         /* conda */
 KNOWNID(SOLVABLE_TRACK_FEATURES,       "solvable:track_features"),     /* conda */
 
-KNOWNID(REPOSITORY_TESTCASE_META,      "repository:testcase:meta"),
-
 KNOWNID(ID_NUM_INTERNAL,               0)
 
 #ifdef KNOWNID_INITIALIZE