- make unknown elements less fatal

[platform/upstream/libsolv.git] / tools / repo_patchxml.c

diff --git a/tools/repo_patchxml.c b/tools/repo_patchxml.c
index f7edd1e..f7fdb0e 100644 (file)
--- a/tools/repo_patchxml.c
+++ b/tools/repo_patchxml.c
@@ -55,6 +55,8 @@ enum state {
   STATE_ENHANCESENTRY,
   STATE_FRESHENS,
   STATE_FRESHENSENTRY,
+  STATE_REBOOT,
+  STATE_RESTART,
   NUMSTATES
 };
 
@@ -79,6 +81,8 @@ static struct stateswitch stateswitches[] = {
   { STATE_PATCH,       "summary",         STATE_SUMMARY, 1 },
   { STATE_PATCH,       "description",     STATE_DESCRIPTION, 1 },
   { STATE_PATCH,       "category",        STATE_CATEGORY, 1 },
+  { STATE_PATCH,       "reboot-needed",   STATE_REBOOT, 0 },
+  { STATE_PATCH,       "package-manager", STATE_RESTART, 0 },
   { STATE_PATCH,       "rpm:requires",    STATE_REQUIRES, 0 },
   { STATE_PATCH,       "rpm:provides",    STATE_PROVIDES, 0 },
   { STATE_PATCH,       "rpm:requires",    STATE_REQUIRES, 0 },
@@ -144,6 +148,7 @@ struct parsedata {
   unsigned int datanum;
   Solvable *solvable;
   char *kind;
+  Offset freshens;
   unsigned int timestamp;
   
   struct stateswitch *swtab[NUMSTATES];
@@ -154,12 +159,6 @@ struct parsedata {
   struct deltarpm delta;
 };
 
-/* repo data attribute ids */
-static Id id_timestamp;
-static Id id_summary;
-static Id id_description;
-static Id id_category;
-
 #if 0
 static void
 append_str(struct parsedata *pd, const char *s)
@@ -356,6 +355,8 @@ startElement(void *userData, const char *name, const char **atts)
     return;
 
   pd->depth++;
+  if (!pd->swtab[pd->state])
+    return;
   for (sw = pd->swtab[pd->state]; sw->from == pd->state; sw++)  /* find name in statetable */
     if (!strcmp(sw->ename, name))
       break;
@@ -409,12 +410,12 @@ startElement(void *userData, const char *name, const char **atts)
         pd->kind = "patch";
       
       pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo));
+      pd->freshens = 0;
 
       if (!strcmp(pd->kind, "patch"))
         {
-          pd->datanum = (pd->solvable - pool->solvables) - pd->repo->start;
-         repodata_extend(pd->data, pd->solvable - pool->solvables);
-          repodata_set_num(pd->data, pd->datanum, id_timestamp, pd->timestamp);
+          pd->datanum = pd->solvable - pool->solvables;
+          repodata_set_num(pd->data, pd->datanum, SOLVABLE_BUILDTIME, pd->timestamp);
        }
 #if 0
       fprintf(stderr, "package #%d\n", pd->solvable - pool->solvables);
@@ -575,11 +576,17 @@ startElement(void *userData, const char *name, const char **atts)
       s->enhances = adddep(pool, pd, s->enhances, atts, 0);
       break;
     case STATE_FRESHENS:
-      s->freshens = 0;
+      pd->freshens = 0;
       break;
     case STATE_FRESHENSENTRY:
-      s->freshens = adddep(pool, pd, s->freshens, atts, 0);
-      break;
+      pd->freshens = adddep(pool, pd, pd->freshens, atts, 0);
+      break;
+    case STATE_REBOOT:
+      repodata_set_void(pd->data, pd->datanum, UPDATE_REBOOT);
+      break;  
+    case STATE_RESTART:
+      repodata_set_void(pd->data, pd->datanum, UPDATE_RESTART);
+      break;  
     default:
       break;
     }
@@ -613,7 +620,9 @@ endElement(void *userData, const char *name)
        s->arch = ARCH_NOARCH;
       if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
         s->provides = repo_addid_dep(pd->repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
-      s->supplements = repo_fix_legacy(pd->repo, s->provides, s->supplements);
+      s->supplements = repo_fix_supplements(pd->repo, s->provides, s->supplements, pd->freshens);
+      s->conflicts = repo_fix_conflicts(pd->repo, s->conflicts);
+      pd->freshens = 0;
       break;
     case STATE_NAME:
       s->name = str2id(pool, pd->content, 1);
@@ -622,13 +631,13 @@ endElement(void *userData, const char *name)
       s->arch = str2id(pool, pd->content, 1);
       break;
     case STATE_SUMMARY:
-      repodata_set_str(pd->data, pd->datanum, id_summary, pd->content);
+      repodata_set_str(pd->data, pd->datanum, SOLVABLE_SUMMARY, pd->content);
       break;
     case STATE_DESCRIPTION:
-      repodata_set_str(pd->data, pd->datanum, id_description, pd->content);
+      repodata_set_str(pd->data, pd->datanum, SOLVABLE_DESCRIPTION, pd->content);
       break;
     case STATE_CATEGORY:  
-      repodata_set_str(pd->data, pd->datanum, id_category, pd->content);
+      repodata_set_str(pd->data, pd->datanum, SOLVABLE_PATCHCATEGORY, pd->content);
       break;
     case STATE_DELTARPM:
 #ifdef TESTMM
@@ -712,6 +721,12 @@ repo_add_patchxml(Repo *repo, FILE *fp, int flags)
   char buf[BUFF_SIZE];
   int i, l;
   struct stateswitch *sw;
+  Repodata *data;
+
+  if (!(flags & REPO_REUSE_REPODATA))
+    data = repo_add_repodata(repo, 0);
+  else
+    data = repo_last_repodata(repo);
 
   memset(&pd, 0, sizeof(pd));
   for (i = 0, sw = stateswitches; sw->from != NUMSTATES; i++, sw++)
@@ -722,13 +737,8 @@ repo_add_patchxml(Repo *repo, FILE *fp, int flags)
     }
   pd.pool = pool;
   pd.repo = repo;
-  pd.data = repo_add_repodata(pd.repo);
+  pd.data = data;
 
-  id_timestamp = str2id(pool, "patch:timestamp", 1);
-  id_summary = str2id(pool, "summary", 1);
-  id_description = str2id(pool, "description", 1);
-  id_category = str2id(pool, "patch:category", 1);
-  
   pd.content = malloc(256);
   pd.acontent = 256;
   pd.lcontent = 0;
@@ -744,7 +754,7 @@ repo_add_patchxml(Repo *repo, FILE *fp, int flags)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
-         fprintf(stderr, "repo_patchxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+         pool_debug(pool, SAT_FATAL, "repo_patchxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
          exit(1);
        }
       if (l == 0)
@@ -752,8 +762,8 @@ repo_add_patchxml(Repo *repo, FILE *fp, int flags)
     }
   XML_ParserFree(parser);
 
-  if (pd.data)
-    repodata_internalize(pd.data);
+  if (!(flags & REPO_NO_INTERNALIZE))
+    repodata_internalize(data);
 
   free(pd.content);
 }