From: Michael Schroeder <mls@suse.de>
Date: Tue, 17 Jul 2018 13:09:15 +0000 (+0200)
Subject: Fix parsing of susetags when the content file does not have a DESCRDIR entry
X-Git-Tag: 0.6.35~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a88c9f1c3f62cb84a399bd85eed1edb9346d13ba;p=thirdparty%2Flibsolv.git

Fix parsing of susetags when the content file does not have a DESCRDIR entry
---

diff --git a/tools/repo2solv.c b/tools/repo2solv.c
index a9f38508..e055e408 100644
--- a/tools/repo2solv.c
+++ b/tools/repo2solv.c
@@ -358,7 +358,7 @@ read_susetags_repo(Repo *repo, const char *dir)
   char *tmp;
   FILE *fp;
   Id defvendor = 0;
-  const char *descrdir = "suse/setup/descr";
+  const char *descrdir = 0;
   char **files = 0;
   int nfiles = 0;
   DIR *dp;
@@ -378,6 +378,8 @@ read_susetags_repo(Repo *repo, const char *dir)
       descrdir = repo_lookup_str(repo, SOLVID_META, SUSETAGS_DESCRDIR);
       defvendor = repo_lookup_id(repo, SOLVID_META, SUSETAGS_DEFAULTVENDOR);
     }
+  if (!descrdir)
+    descrdir = "suse/setup/descr";
   tmp = solv_free(tmp);
 
   /* get content of descrdir directory */