add check command

Change-Id: I52ffea0bb351718af8a27e9391d05fa18f2c85c8
vmware · Sep 29, 2017 · 0ba0916 · 0ba0916
1 parent df91812
commit 0ba0916
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 1 deletion.
diff --git a/client/api.c b/client/api.c
@@ -98,6 +98,53 @@ TDNFUninit(
     pthread_mutex_unlock(&gEnv.mutexInitialize);
 }
 
+//Check all available packages
+uint32_t
+TDNFCheckPackages(
+    PTDNF pTdnf
+    )
+{
+    uint32_t dwError = 0;
+    PTDNF_SOLVED_PKG_INFO pSolvedPkgInfo = NULL;
+    PTDNF_CMD_ARGS pArgs = NULL;
+    int nCmdCountOrig = 0;
+    char **ppszCmdsOrig = NULL;
+    char *ppszCheckCmds[] = {"check", "*", NULL};
+
+    if(!pTdnf || !pTdnf->pArgs)
+    {
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_TDNF_ERROR(dwError);
+    }
+
+    pArgs = pTdnf->pArgs;
+    nCmdCountOrig = pArgs->nCmdCount;
+    ppszCmdsOrig = pArgs->ppszCmds;
+
+    //We dont intend to follow through on this install command
+    pArgs->nAssumeNo = 1;
+
+    //pass all packages available to resolve with install operation
+    pArgs->nCmdCount = 2;
+    pArgs->ppszCmds = ppszCheckCmds;
+
+    dwError = TDNFResolve(pTdnf, ALTER_INSTALL, &pSolvedPkgInfo);
+    BAIL_ON_TDNF_ERROR(dwError);
+
+cleanup:
+    if(pArgs)
+    {
+        pArgs->nCmdCount = nCmdCountOrig;
+        pArgs->ppszCmds = ppszCmdsOrig;
+    }
+
+    return dwError;
+
+error:
+    goto cleanup;
+}
+
+
 //All alter commands such as install/update/erase
 uint32_t
 TDNFAlterCommand(

diff --git a/client/resolve.c b/client/resolve.c
@@ -612,8 +612,20 @@ TDNFPrepareSinglePkg(
 error:
     if(dwError == ERROR_TDNF_ALREADY_INSTALLED)
     {
+        int nShowAlreadyInstalled = 1;
+        //dont show already installed errors in the check path
+        if(pTdnf && pTdnf->pArgs)
+        {
+            if(!strcmp(pTdnf->pArgs->ppszCmds[0], "check"))
+            {
+                nShowAlreadyInstalled = 0;
+            }
+        }
         dwError = 0;
-        fprintf(stderr, "Package %s is already installed.\n", pszPkgName);
+        if(nShowAlreadyInstalled)
+        {
+            fprintf(stderr, "Package %s is already installed.\n", pszPkgName);
+        }
     }
     if(dwError == ERROR_TDNF_NO_UPGRADE_PATH)
     {

diff --git a/include/tdnf.h b/include/tdnf.h
@@ -91,6 +91,12 @@ TDNFMakeCache(
     PTDNF pTdnf
     );
 
+//check all packages in all enables repositories
+uint32_t
+TDNFCheckPackages(
+    PTDNF pTdnf
+    );
+
 //check all packages in a local directory
 //using the local directory contents 
 //for dep resolution.

diff --git a/include/tdnfcli.h b/include/tdnfcli.h
@@ -154,6 +154,12 @@ TDNFCliRepoListCommand(
     PTDNF_CMD_ARGS pCmdArgs
     );
 
+uint32_t
+TDNFCliCheckCommand(
+    PTDNF_CLI_CONTEXT pContext,
+    PTDNF_CMD_ARGS pCmdArgs
+    );
+
 uint32_t
 TDNFCliCheckLocalCommand(
     PTDNF_CLI_CONTEXT pContext,

diff --git a/include/tdnfclitypes.h b/include/tdnfclitypes.h
@@ -48,6 +48,10 @@ typedef uint32_t
     TDNF_ALTERTYPE,
     PTDNF_SOLVED_PKG_INFO);
 
+typedef uint32_t
+(*PFN_TDNF_CHECK)(
+    PTDNF_CLI_CONTEXT);
+
 typedef uint32_t
 (*PFN_TDNF_CHECK_LOCAL)(
     PTDNF_CLI_CONTEXT,
@@ -147,6 +151,7 @@ typedef struct _TDNF_CLI_CONTEXT_
     PFN_TDNF_SEARCH             pFnSearch;
     PFN_TDNF_UPDATEINFO         pFnUpdateInfo;
     PFN_TDNF_UPDATEINFO_SUMMARY pFnUpdateInfoSummary;
+    PFN_TDNF_CHECK              pFnCheck;
 }TDNF_CLI_CONTEXT, *PTDNF_CLI_CONTEXT;
 
 #ifdef __cplusplus

diff --git a/tools/cli/lib/api.c b/tools/cli/lib/api.c
@@ -533,3 +533,28 @@ TDNFCliMakeCacheCommand(
 error:
     goto cleanup;
 }
+
+uint32_t
+TDNFCliCheckCommand(
+    PTDNF_CLI_CONTEXT pContext,
+    PTDNF_CMD_ARGS pCmdArgs
+    )
+{
+    uint32_t dwError = 0;
+
+    if(!pContext || !pContext->hTdnf || !pCmdArgs)
+    {
+        dwError = ERROR_TDNF_CLI_INVALID_ARGUMENT;
+        BAIL_ON_CLI_ERROR(dwError);
+    }
+
+    dwError = pContext->pFnCheck(pContext);
+    BAIL_ON_CLI_ERROR(dwError);
+
+    fprintf(stdout, "Check completed without issues\n");
+cleanup:
+    return dwError;
+
+error:
+    goto cleanup;
+}
diff --git a/tools/cli/lib/help.c b/tools/cli/lib/help.c
@@ -50,6 +50,7 @@ TDNFCliShowHelp(
     printf("List of Main Commands\n");
     printf("\n");
 
+    printf("check                     Checks for problems in installed and available packages\n");
     printf("check-local               Checks local rpm folder for problems\n");
     printf("check-update              Check for available package upgrades\n");
     printf("clean                     Remove cached data\n");

diff --git a/tools/cli/main.c b/tools/cli/main.c
@@ -32,6 +32,7 @@ int main(int argc, char* argv[])
     {
         {"autoerase",          TDNFCliAutoEraseCommand},
         {"autoremove",         TDNFCliAutoEraseCommand},
+        {"check",              TDNFCliCheckCommand},
         {"check-local",        TDNFCliCheckLocalCommand},
         {"check-update",       TDNFCliCheckUpdateCommand},
         {"clean",              TDNFCliCleanCommand},
@@ -62,6 +63,7 @@ int main(int argc, char* argv[])
     PTDNF pTdnf = NULL;
     int nFound = 0;
 
+    _context.pFnCheck = TDNFCliInvokeCheck;
     _context.pFnCheckLocal = TDNFCliInvokeCheckLocal;
     _context.pFnCheckUpdate = TDNFCliInvokeCheckUpdate;
     _context.pFnClean = TDNFCliInvokeClean;
@@ -241,6 +243,14 @@ TDNFCliVerboseShowEnv(
     goto cleanup;
 }
 
+uint32_t
+TDNFCliInvokeCheck(
+    PTDNF_CLI_CONTEXT pContext
+    )
+{
+    return TDNFCheckPackages(pContext->hTdnf);
+}
+
 uint32_t
 TDNFCliInvokeCheckLocal(
     PTDNF_CLI_CONTEXT pContext,

diff --git a/tools/cli/prototypes.h b/tools/cli/prototypes.h
@@ -30,6 +30,11 @@ TDNFCliInvokeAlter(
     PTDNF_SOLVED_PKG_INFO pSolvedPkgInfo
     );
 
+uint32_t
+TDNFCliInvokeCheck(
+    PTDNF_CLI_CONTEXT pContext
+    );
+
 uint32_t
 TDNFCliInvokeCheckLocal(
     PTDNF_CLI_CONTEXT pContext,