|
| 1 | +From de3e822976773916caa913e4339a35c08a98569d Mon Sep 17 00:00:00 2001 |
| 2 | +From: Sam Meluch <sammeluch@microsoft.com> |
| 3 | +Date: Thu, 23 Jan 2025 11:55:10 -0800 |
| 4 | +Subject: [PATCH] Retain installonlypkg install status on upgrade |
| 5 | + |
| 6 | +--- |
| 7 | + client/goal.c | 30 +++++++++++++++++++++ |
| 8 | + pytests/tests/test_multiinstall.py | 42 ++++++++++++++++++++++++++++++ |
| 9 | + 2 files changed, 72 insertions(+) |
| 10 | + |
| 11 | +diff --git a/client/goal.c b/client/goal.c |
| 12 | +index 4d95c71..f2360c4 100644 |
| 13 | +--- a/client/goal.c |
| 14 | ++++ b/client/goal.c |
| 15 | +@@ -754,6 +754,36 @@ TDNFMarkAutoInstalled( |
| 16 | + } |
| 17 | + } |
| 18 | + } |
| 19 | ++ /* During upgrades, ppInfo->pPkgsToInstall contains any packages that are |
| 20 | ++ being installed as a dependency automatically as well as any |
| 21 | ++ ppszInstallOnlyPkgs which are installing a new version. The packages |
| 22 | ++ configured as installonlypkgs need to retain to retain their previous |
| 23 | ++ install status. |
| 24 | ++ */ |
| 25 | ++ if (nFlag == 1 && pTdnf->pConf && pTdnf->pConf->ppszInstallOnlyPkgs) |
| 26 | ++ { |
| 27 | ++ for (int i = 0; pTdnf->pConf->ppszInstallOnlyPkgs[i]; i++) |
| 28 | ++ { |
| 29 | ++ if (strcmp(pTdnf->pConf->ppszInstallOnlyPkgs[i], pszName) == 0) |
| 30 | ++ { |
| 31 | ++ // Lookup current auto install status, ensure matching status |
| 32 | ++ int value = 0; |
| 33 | ++ rc = history_get_auto_flag(pHistoryCtx, pszName, &value); |
| 34 | ++ if (rc != 0) |
| 35 | ++ { |
| 36 | ++ dwError = ERROR_TDNF_HISTORY_ERROR; |
| 37 | ++ BAIL_ON_TDNF_ERROR(dwError); |
| 38 | ++ } |
| 39 | ++ if (value == 0) |
| 40 | ++ { |
| 41 | ++ // Packages previously marked as user installed should |
| 42 | ++ // remain user installed. |
| 43 | ++ nFlag = 0; |
| 44 | ++ break; |
| 45 | ++ } |
| 46 | ++ } |
| 47 | ++ } |
| 48 | ++ } |
| 49 | + if (!nAutoOnly || nFlag == 1) |
| 50 | + { |
| 51 | + rc = history_set_auto_flag(pHistoryCtx, pszName, nFlag); |
| 52 | +diff --git a/pytests/tests/test_multiinstall.py b/pytests/tests/test_multiinstall.py |
| 53 | +index efc921c..e069fe1 100644 |
| 54 | +--- a/pytests/tests/test_multiinstall.py |
| 55 | ++++ b/pytests/tests/test_multiinstall.py |
| 56 | +@@ -149,3 +149,45 @@ def test_install_reinstall(utils): |
| 57 | + # both pkgs should remain installed: |
| 58 | + assert utils.check_package(pkgname, version=first) |
| 59 | + assert utils.check_package(pkgname, version=second) |
| 60 | ++ |
| 61 | ++def test_autoremove_after_upgrade_user_installed(utils): |
| 62 | ++ pkgname = PKGNAME |
| 63 | ++ utils.erase_package(pkgname) |
| 64 | ++ |
| 65 | ++ # install first version |
| 66 | ++ first = PKG_VERSIONS[0] |
| 67 | ++ utils.run(['tdnf', 'install', '-y', '--nogpgcheck', f"{pkgname}={first}"]) |
| 68 | ++ assert utils.check_package(pkgname, version=first) |
| 69 | ++ |
| 70 | ++ # upgrade to latest |
| 71 | ++ upgrade_version = PKG_VERSIONS[3] |
| 72 | ++ utils.run(['tdnf', 'upgrade', '-y', '--nogpgcheck']) |
| 73 | ++ assert utils.check_package(pkgname, version=upgrade_version) |
| 74 | ++ |
| 75 | ++ utils.run(['tdnf', 'autoremove', '-y']) |
| 76 | ++ # check both packages remain installed after autoremove |
| 77 | ++ assert utils.check_package(pkgname, version=upgrade_version) |
| 78 | ++ assert utils.check_package(pkgname, version=first) |
| 79 | ++ |
| 80 | ++def test_autoremove_after_upgrade_auto_installed(utils): |
| 81 | ++ pkgname = PKGNAME |
| 82 | ++ utils.erase_package(pkgname) |
| 83 | ++ |
| 84 | ++ # install first version |
| 85 | ++ first = PKG_VERSIONS[0] |
| 86 | ++ utils.run(['tdnf', 'install', '-y', '--nogpgcheck', f"{pkgname}={first}"]) |
| 87 | ++ assert utils.check_package(pkgname, version=first) |
| 88 | ++ |
| 89 | ++ # mark package as autoinstalled |
| 90 | ++ ret = utils.run(['tdnf', 'mark', 'remove', pkgname]) |
| 91 | ++ assert ret['retval'] == 0 |
| 92 | ++ |
| 93 | ++ # upgrade to latest |
| 94 | ++ upgrade_version = PKG_VERSIONS[3] |
| 95 | ++ utils.run(['tdnf', 'upgrade', '-y', '--nogpgcheck']) |
| 96 | ++ assert utils.check_package(pkgname, version=upgrade_version) |
| 97 | ++ |
| 98 | ++ utils.run(['tdnf', 'autoremove', '-y']) |
| 99 | ++ # check both packages remain installed after autoremove |
| 100 | ++ assert not utils.check_package(pkgname, version=upgrade_version) |
| 101 | ++ assert not utils.check_package(pkgname, version=first) |
| 102 | +-- |
| 103 | +2.34.1 |
| 104 | + |
0 commit comments