Merge pull request #370 from oliverkurth/stable-3.3

Fix minversions overwriting excludes
vmware · Nov 23, 2022 · d432945 · d432945
2 parents 4267d29 + 9c880af
commit d432945
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
 
-project(tdnf VERSION 3.3.2 LANGUAGES C)
+project(tdnf VERSION 3.3.3 LANGUAGES C)
 set(VERSION ${PROJECT_VERSION})
 set(PROJECT_YEAR 2022)
 

diff --git a/client/goal.c b/client/goal.c
@@ -961,14 +961,10 @@ TDNFSolvAddMinVersions(
                              sizeof(Map),
                              (void**)&pPool->considered);
         map_init(pPool->considered, pPool->nsolvables);
+        map_setall(pPool->considered);
     }
-    else
-    {
-        map_grow(pPool->considered, pPool->nsolvables);
-    }
-
-    map_setall(pPool->considered);
     map_subtract(pPool->considered, pMapMinVersions);
+
 cleanup:
     if(pMapMinVersions)
     {

diff --git a/pytests/tests/test_excludes.py b/pytests/tests/test_excludes.py
@@ -7,6 +7,8 @@
 #
 
 import pytest
+import os
+import shutil
 
 
 @pytest.fixture(scope='module', autouse=True)
@@ -20,6 +22,23 @@ def teardown_test(utils):
         pkgname = utils.config[pkg]
         utils.run(['tdnf', 'erase', '-y', pkgname])
 
+    dirname = os.path.join(utils.config['repo_path'], 'minversions.d')
+    if os.path.isdir(dirname):
+        shutil.rmtree(dirname)
+
+    utils.tdnf_config.remove_option('main', 'minversions')
+    filename = os.path.join(utils.config['repo_path'], 'tdnf.conf')
+    with open(filename, 'w') as f:
+        utils.tdnf_config.write(f, space_around_delimiters=False)
+
+
+def set_minversions_file(utils, value):
+    dirname = os.path.join(utils.config['repo_path'], 'minversions.d')
+    utils.makedirs(dirname)
+    filename = os.path.join(dirname, 'test.conf')
+    with open(filename, 'w') as f:
+        f.write(value)
+
 
 # specifying the version should not override the exclude (negative test)
 def test_install_package_with_version_suffix(utils):
@@ -79,3 +98,27 @@ def test_remove_package(utils):
     utils.run(['tdnf', 'remove', '--exclude=', pkgname, '-y', '--nogpgcheck', pkgname])
     # package should still be there
     assert utils.check_package(pkgname)
+
+
+# test for issue #367
+def test_with_minversion_existing(utils):
+    mverpkg = utils.config["sglversion_pkgname"]
+    set_minversions_file(utils, mverpkg + "=1.0.1-2\n")
+
+    pkgname = utils.config["mulversion_pkgname"]
+    pkgversion1 = utils.config["mulversion_lower"]
+    pkgversion2 = utils.config["mulversion_higher"]
+
+    if '-' in pkgversion1:
+        pkgversion1 = pkgversion1.split('-')[0]
+    if '-' in pkgversion2:
+        pkgversion2 = pkgversion2.split('-')[0]
+
+    utils.erase_package(pkgname)
+
+    utils.run(['tdnf', 'install', '-y', '--nogpgcheck', pkgname + '-' + pkgversion1])
+    assert utils.check_package(pkgname, pkgversion1)
+
+    utils.run(['tdnf', 'update', '--exclude=', '-y', '--nogpgcheck', pkgname + '-' + pkgversion2])
+    assert not utils.check_package(pkgname, pkgversion2)
+    assert utils.check_package(pkgname, pkgversion1)
diff --git a/solv/tdnfpackage.c b/solv/tdnfpackage.c
@@ -1711,12 +1711,8 @@ SolvAddExcludes(
                               sizeof(Map),
                               (void**)&pPool->considered);
          map_init(pPool->considered, pPool->nsolvables);
+         map_setall(pPool->considered);
      }
-     else
-     {
-         map_grow(pPool->considered, pPool->nsolvables);
-     }
-     map_setall(pPool->considered);
      map_subtract(pPool->considered, pExcludes);
 
 cleanup:
@@ -1735,7 +1731,7 @@ SolvDataIterator(
 {
     Dataiterator di;
     Id keyname = SOLVABLE_NAME;
-    char **ppszPackagesTemp = NULL;
+    char **ppszPkg = NULL;
     uint32_t dwError = 0;
 
     if (!pPool || !ppszExcludes || !pMap)
@@ -1744,22 +1740,20 @@ SolvDataIterator(
         BAIL_ON_TDNF_ERROR(dwError);
     }
 
-    ppszPackagesTemp = ppszExcludes;
-    while(ppszPackagesTemp && *ppszPackagesTemp)
+    for (ppszPkg = ppszExcludes; ppszPkg && *ppszPkg; ppszPkg++)
     {
           int flags = SEARCH_STRING;
-          if (SolvIsGlob(*ppszPackagesTemp))
+          if (SolvIsGlob(*ppszPkg))
           {
               flags = SEARCH_GLOB;
           }
-          dwError = dataiterator_init(&di, pPool, 0, 0, keyname, *ppszPackagesTemp, flags);
+          dwError = dataiterator_init(&di, pPool, 0, 0, keyname, *ppszPkg, flags);
           BAIL_ON_TDNF_ERROR(dwError);
           while (dataiterator_step(&di))
           {
               MAPSET(pMap, di.solvid);
           }
           dataiterator_free(&di);
-          ++ppszPackagesTemp;
     }
 cleanup:
     return dwError;