Merge pull request #443 from oliverkurth/topic/okurth/minor-annoyances

Minor fixes
vmware · Aug 2, 2023 · 433c34b · 433c34b
2 parents c68ff28 + 05b8e4e
commit 433c34b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/client/remoterepo.c b/client/remoterepo.c
@@ -163,6 +163,7 @@ TDNFDownloadFile(
     /* lStatus reads CURLINFO_RESPONSE_CODE. Must be long */
     long lStatus = 0;
     int i;
+    int nNoOutput = 1;
 
     /* TDNFFetchRemoteGPGKey sends pszProgressData as NULL */
     if(!pTdnf ||
@@ -215,6 +216,7 @@ TDNFDownloadFile(
         {
             dwError = set_progress_cb(pCurl, pszProgressData);
             BAIL_ON_TDNF_ERROR(dwError);
+            nNoOutput = 0;
         }
     }
 
@@ -253,6 +255,11 @@ TDNFDownloadFile(
         fclose(fp);
         fp = NULL;
     }
+    /* finish progress line output,
+       but only if progrees was enabled */
+    if (!nNoOutput) {
+        pr_info("\n");
+    }
 
     dwError = curl_easy_getinfo(pCurl,
                                 CURLINFO_RESPONSE_CODE,
@@ -405,8 +412,6 @@ TDNFDownloadPackage(
     }
     BAIL_ON_TDNF_ERROR(dwError);
 
-    pr_info("\n");
-
 cleanup:
     TDNF_SAFE_FREE_MEMORY(pszCopyOfPackageLocation);
     TDNF_SAFE_FREE_MEMORY(pszPackageFile);

diff --git a/pytests/tests/test_json.py b/pytests/tests/test_json.py
@@ -141,7 +141,7 @@ def test_erase_verbose(utils):
 def test_check_update(utils):
     ret = utils.run(['tdnf', '-j', 'check-update'])
     d = json.loads("\n".join(ret['stdout']))
-    assert type(d) == list
+    assert type(d) is list
 
 
 def test_repolist(utils):
@@ -160,25 +160,25 @@ def test_repolist(utils):
 def test_repoquery(utils):
     ret = utils.run(['tdnf', '-j', 'repoquery'])
     d = json.loads("\n".join(ret['stdout']))
-    assert type(d) == list
+    assert type(d) is list
 
 
 def test_updateinfo(utils):
     ret = utils.run(['tdnf', '-j', 'updateinfo'])
     d = json.loads("\n".join(ret['stdout']))
-    assert type(d) == dict
+    assert type(d) is dict
 
 
 def test_updateinfo_info(utils):
     ret = utils.run(['tdnf', '-j', 'updateinfo', '--info'])
     d = json.loads("\n".join(ret['stdout']))
-    assert type(d) == list
+    assert type(d) is list
 
 
 def test_history_info(utils):
     ret = utils.run(['tdnf', '-j', 'history', '--info'])
     d = json.loads("\n".join(ret['stdout']))
-    assert type(d) == list
+    assert type(d) is list
 
 
 def test_jsondump(utils):

diff --git a/solv/tdnfquery.c b/solv/tdnfquery.c
@@ -606,6 +606,7 @@ SolvApplyListQuery(
              SELECTION_PROVIDES |
              SELECTION_GLOB |     /* foo* */
              SELECTION_CANON |    /* foo-1.2-3.ph4.noarch */
+	     SELECTION_DOTARCH |  /* foo.noarch */
              SELECTION_REL;       /* foo>=1.2-3 */
 
     if (pQuery->nScope == SCOPE_SOURCE) {

diff --git a/tools/cli/lib/api.c b/tools/cli/lib/api.c
@@ -187,7 +187,7 @@ TDNFCliListPackagesPrint(
             if(snprintf(
                 szNameAndArch,
                 MAX_COL_LEN,
-                "%s.%s",
+                "%s.%s ",
                 pPkg->pszName,
                 pPkg->pszArch) < 0)
             {
@@ -199,7 +199,7 @@ TDNFCliListPackagesPrint(
             if(snprintf(
                 szVersionAndRelease,
                 MAX_COL_LEN,
-                "%s-%s",
+                "%s-%s ",
                 pPkg->pszVersion,
                 pPkg->pszRelease) < 0)
             {