]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
Fix parsing of susetags when the content file does not have a DESCRDIR entry
authorMichael Schroeder <mls@suse.de>
Tue, 17 Jul 2018 13:09:15 +0000 (15:09 +0200)
committerMichael Schroeder <mls@suse.de>
Tue, 17 Jul 2018 13:09:15 +0000 (15:09 +0200)
tools/repo2solv.c

index a9f38508d0f02905e9d5fc03db8886b2999ddbf4..e055e408007714b7fff8e3e6f7189552ffff1b7c 100644 (file)
@@ -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 */