move yum_substitute data freeing to free_repoinfos call

diff --git a/examples/solv/repoinfo.c b/examples/solv/repoinfo.c
index 8066b49e090550c2a0dbc0ff0f02a097421702a4..e08d160de7f86f05319232ed38c6bf6950ed6245 100644 (file)
--- a/examples/solv/repoinfo.c
+++ b/examples/solv/repoinfo.c
@@ -76,6 +76,9 @@ free_repoinfos(struct repoinfo *repoinfos, int nrepoinfos)
       solv_free(cinfo->components);
     }
   solv_free(repoinfos);
+#if defined(SUSE) || defined(FEDORA)
+  yum_substitute((Pool *)0, 0);                /* free data */
+#endif
 }
 
 struct repoinfo *

diff --git a/examples/solv/solv.c b/examples/solv/solv.c
index 55a39bf9d111025824b9d9434b5583ebec2edd18..e798a2c21c4bd4715aae41f45b08198d3b690160 100644 (file)
--- a/examples/solv/solv.c
+++ b/examples/solv/solv.c
@@ -43,9 +43,6 @@
 #include "repoinfo.h"
 #include "repoinfo_cache.h"
 #include "repoinfo_download.h"
-#if defined(SUSE) || defined(FEDORA)
-#include "repoinfo_config_yum.h"
-#endif
 
 #if defined(ENABLE_RPMDB)
 #include "fileprovides.h"
@@ -633,9 +630,6 @@ main(int argc, char **argv)
        }
       queue_free(&q);
       queue_free(&job);
-#if defined(SUSE) || defined(FEDORA)
-      yum_substitute(pool, 0);
-#endif
       pool_free(pool);
       free_repoinfos(repoinfos, nrepoinfos);
       solv_free(commandlinepkgs);
@@ -745,9 +739,6 @@ rerunsolver:
       transaction_free(trans);
       solver_free(solv);
       queue_free(&job);
-#if defined(SUSE) || defined(FEDORA)
-      yum_substitute(pool, 0);
-#endif
       pool_free(pool);
       free_repoinfos(repoinfos, nrepoinfos);
       solv_free(commandlinepkgs);
@@ -770,9 +761,6 @@ rerunsolver:
       transaction_free(trans);
       solver_free(solv);
       queue_free(&job);
-#if defined(SUSE) || defined(FEDORA)
-      yum_substitute(pool, 0);
-#endif
       pool_free(pool);
       free_repoinfos(repoinfos, nrepoinfos);
       solv_free(commandlinepkgs);
@@ -916,9 +904,6 @@ rerunsolver:
   transaction_free(trans);
   solver_free(solv);
   queue_free(&job);
-#if defined(SUSE) || defined(FEDORA)
-  yum_substitute(pool, 0);
-#endif
   pool_free(pool);
   free_repoinfos(repoinfos, nrepoinfos);
   solv_free(commandlinepkgs);