Imported Upstream version 0.6.14

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

diff --git a/tools/repomdxml2solv.c b/tools/repomdxml2solv.c
index 9af5e96..f32c35d 100644 (file)
--- a/tools/repomdxml2solv.c
+++ b/tools/repomdxml2solv.c
@@ -76,12 +76,9 @@ doquery(Pool *pool, Repo *repo, const char *query)
        case REPOKEY_TYPE_CONSTANT:
          printf("%llu\n", SOLV_KV_NUM64(&di.kv));
          break;
-       case REPOKEY_TYPE_MD5:
-       case REPOKEY_TYPE_SHA1:
-       case REPOKEY_TYPE_SHA256:
-         printf("%s:%s\n", solv_chksum_type2str(di.key->type), repodata_chk2str(di.data, di.key->type, (unsigned char *)di.kv.str));
-         break;
        default:
+         if (solv_chksum_len(di.key->type))
+           printf("%s:%s\n", solv_chksum_type2str(di.key->type), repodata_chk2str(di.data, di.key->type, (unsigned char *)di.kv.str));
          break;
        }
     }
@@ -112,7 +109,11 @@ main(int argc, char **argv)
           break;
         }
     }
-  repo_add_repomdxml(repo, stdin, flags);
+  if (repo_add_repomdxml(repo, stdin, flags))
+    {
+      fprintf(stderr, "repomdxml2solv: %s\n", pool_errstr(pool));
+      exit(1);
+    }
   if (query)
     doquery(pool, repo, query);
   else