X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2Frpmdb2solv.c;h=33796ff464c03b3a465498f8ab3d80127de257b0;hb=3bd3e6a00b6f9d48082298b1ae03a76c59a9cdc1;hp=515a8e7bfc521e5b0e1911557bd83ba36a0e6b3c;hpb=6513e0e4d8c08d9b706dbbea21a944b83c226c75;p=platform%2Fupstream%2Flibsolv.git

diff --git a/tools/rpmdb2solv.c b/tools/rpmdb2solv.c
index 515a8e7..33796ff 100644
--- a/tools/rpmdb2solv.c
+++ b/tools/rpmdb2solv.c
@@ -58,7 +58,9 @@ main(int argc, char **argv)
   const char *root = 0;
   const char *basefile = 0;
   const char *refname = 0;
+#ifdef ENABLE_SUSEREPO
   char *proddir = 0;
+#endif
   char *outfile = 0;
 
   /*
@@ -84,7 +86,9 @@ main(int argc, char **argv)
 	percent = 1;
 	break;
       case 'p':
+#ifdef ENABLE_SUSEREPO
 	proddir = optarg;
+#endif
 	break;
       case 'x':
         extrapool = 1;
@@ -124,7 +128,7 @@ main(int argc, char **argv)
 	  else
 	    refpool = pool;
 	  ref = repo_create(refpool, "ref");
-	  repo_add_solv(ref, fp);
+	  repo_add_solv(ref, fp, 0);
 	  repo_disable_paging(ref);
 	  fclose(fp);
 	}
@@ -143,6 +147,7 @@ main(int argc, char **argv)
   if (!nopacks)
     repo_add_rpmdb(repo, ref, root, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE | (percent ? RPMDB_REPORT_PROGRESS : 0));
 
+#ifdef ENABLE_SUSEREPO
   if (proddir && *proddir)
     {
       char *buf = proddir;
@@ -152,7 +157,7 @@ main(int argc, char **argv)
 	  int rootlen = strlen(root);
 	  if (strncmp(root, proddir, rootlen))
 	    {
-	      buf = (char *)sat_malloc(rootlen + strlen(proddir) + 2); /* + '/' + \0 */
+	      buf = (char *)solv_malloc(rootlen + strlen(proddir) + 2); /* + '/' + \0 */
 	      strcpy(buf, root);
 	      if (root[rootlen - 1] != '/' && *proddir != '/')
 		buf[rootlen++] = '/';
@@ -161,9 +166,9 @@ main(int argc, char **argv)
 	}
       repo_add_products(repo, buf, root, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE);
       if (buf != proddir)
-	sat_free(buf);
+	solv_free(buf);
     }
-      
+#endif
   repodata_internalize(data);
 
   if (ref)