remove validate.c

vmware · Apr 26, 2022 · cf8a27d · cf8a27d
1 parent b42bf38
commit cf8a27d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 59 deletions.
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -44,7 +44,6 @@ add_library(${LIB_TDNF} SHARED
     rpmtrans.c
     updateinfo.c
     utils.c
-    validate.c
     metalink.c
     list.c
 )

diff --git a/client/api.c b/client/api.c
@@ -1563,6 +1563,17 @@ TDNFResolve(
         BAIL_ON_TDNF_ERROR(dwError);
     }
 
+    if (nAlterType == ALTER_INSTALL ||
+        nAlterType == ALTER_REINSTALL ||
+        nAlterType == ALTER_ERASE)
+    {
+        if(pTdnf->pArgs->nCmdCount <= 1)
+        {
+            dwError = ERROR_TDNF_PACKAGE_REQUIRED;
+            BAIL_ON_TDNF_ERROR(dwError);
+        }
+    }
+
     queue_init(&queueGoal);
 
     if(nAlterType == ALTER_INSTALL || nAlterType == ALTER_REINSTALL)
@@ -1574,9 +1585,6 @@ TDNFResolve(
     dwError = TDNFRefresh(pTdnf);
     BAIL_ON_TDNF_ERROR(dwError);
 
-    dwError = TDNFValidateCmdArgs(pTdnf);
-    BAIL_ON_TDNF_ERROR(dwError);
-
     dwError = TDNFAllocateMemory(
                   pTdnf->pArgs->nCmdCount,
                   sizeof(char*),

diff --git a/client/validate.c b/client/validate.c
diff --git a/pytests/tests/test_erase.py b/pytests/tests/test_erase.py
@@ -21,7 +21,7 @@ def teardown_test(utils):
 
 def test_erase_no_arg(utils):
     ret = utils.run(['tdnf', 'erase'])
-    assert(ret['stderr'][0] == 'Nothing to do.')
+    assert(ret['retval'] == 1001)
 
 
 def test_erase_invalid_package(utils):