move SolvReadInstalledRpms() to OpenHandle()

vmware · Oct 31, 2022 · ffe6e36 · ffe6e36
1 parent 58f1396
commit ffe6e36
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/client/api.c b/client/api.c
@@ -693,10 +693,15 @@ TDNFOpenHandle(
     dwError = SolvInitSack(
                   &pSack,
                   pTdnf->pConf->pszCacheDir,
-                  pTdnf->pArgs->pszInstallRoot,
-                  pArgs->nAllDeps);
+                  pTdnf->pArgs->pszInstallRoot);
     BAIL_ON_TDNF_ERROR(dwError);
 
+    if(!pArgs->nAllDeps)
+    {
+        dwError = SolvReadInstalledRpms(pSack->pPool->installed, pszCacheDir);
+        BAIL_ON_TDNF_LIBSOLV_ERROR(dwError);
+    }
+
     dwError = TDNFLoadRepoData(
                   pTdnf,
                   REPOLISTFILTER_ALL,

diff --git a/solv/prototypes.h b/solv/prototypes.h
@@ -335,10 +335,8 @@ uint32_t
 SolvInitSack(
     PSolvSack *ppSack,
     const char* pszCacheDir,
-    const char* pszRootDir,
-    int nInstallAllDeps
-    );
-
+    const char* pszRootDir
+);
 
 // tdnfquery.c
 uint32_t

diff --git a/solv/tdnfpool.c b/solv/tdnfpool.c
@@ -67,8 +67,7 @@ uint32_t
 SolvInitSack(
     PSolvSack *ppSack,
     const char* pszCacheDir,
-    const char* pszRootDir,
-    int nInstallAllDeps
+    const char* pszRootDir
     )
 {
     uint32_t dwError = 0;
@@ -122,15 +121,7 @@ SolvInitSack(
        dwError = ERROR_TDNF_INVALID_PARAMETER;
        BAIL_ON_TDNF_LIBSOLV_ERROR(dwError);
     }
-
-    if(!nInstallAllDeps)
-    {
-        dwError = SolvReadInstalledRpms(pRepo, pszCacheDir);
-        BAIL_ON_TDNF_LIBSOLV_ERROR(dwError);
-    }
-
     pool_set_installed(pPool, pRepo);
-    pool_createwhatprovides(pPool);
 
     pSack->pPool = pPool;
     *ppSack = pSack;