Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update just in mode install and don't fail if mode check for tools.system.package_manager #11712

Merged
merged 3 commits into from Jul 27, 2022
Merged

Update just in mode install and don't fail if mode check for tools.system.package_manager #11712

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d9cf7e
update just if install
czoido Jul 27, 2022
aa031d2
review
czoido Jul 27, 2022
9f8181a
unused import
czoido Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions conan/tools/system/package_manager.py
View file
Open in desktop
Expand Up @@ -132,16 +132,15 @@ def _install(self, packages, update=False, check=True, **kwargs):
"installed".format(" ".join(packages)))

def _update(self):
if self._mode == self.mode_check:
raise ConanException("Can't update because tools.system.package_manager:mode is '{0}'."
"Please update packages manually or set "
"'tools.system.package_manager:mode' "
"to '{1}' in the [conf] section of the profile, "
"or in the command line using "
"'-c tools.system.package_manager:mode={1}'".format(self.mode_check,
self.mode_install))
command = self.update_command.format(sudo=self.sudo_str, tool=self.tool_name)
return self._conanfile_run(command, self.accepted_update_codes)
# we just update the package manager database in case we are in 'install mode'
# in case we are in check mode warn about that but don't fail
if self._mode == self.mode_install:
command = self.update_command.format(sudo=self.sudo_str, tool=self.tool_name)
return self._conanfile_run(command, self.accepted_update_codes)
else:
self._conanfile.output.info(f"Did not update '{str(self.__class__.__name__)}'. "
czoido marked this conversation as resolved.
Show resolved Hide resolved
f"To run the update operation set the 'tools.system.package_manager:mode' "
f"configuration to 'install'")

def _check(self, packages):
missing = [pkg for pkg in packages if self.check_package(self.get_package_name(pkg)) != 0]
Expand Down
42 changes: 15 additions & 27 deletions conans/test/integration/tools/system/package_manager_test.py
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
from conans.errors import ConanException
from conans.model.conf import Conf
from conans.test.utils.mocks import ConanFileMock
from conans.test.utils.tools import redirect_output


@pytest.mark.parametrize("platform, tool", [
Expand Down Expand Up @@ -130,27 +131,8 @@ def fake_check(*args, **kwargs):
"'-c tools.system.package_manager:mode=install'"


@pytest.mark.parametrize("tool_class",
[Apt, Yum, Dnf, Brew, Pkg, PkgUtil, Chocolatey, PacMan, Zypper])
def test_tools_update_mode_check(tool_class):
conanfile = ConanFileMock()
conanfile.conf = Conf()
conanfile.settings = Settings()
conanfile.conf["tools.system.package_manager:tool"] = tool_class.tool_name
conanfile.conf["tools.system.package_manager:mode"] = "check"
with mock.patch('conans.ConanFile.context', new_callable=PropertyMock) as context_mock:
context_mock.return_value = "host"
tool = tool_class(conanfile)
with pytest.raises(ConanException) as exc_info:
tool.update()
assert exc_info.value.args[0] == "Can't update because tools.system.package_manager:mode is " \
"'check'.Please update packages manually or set " \
"'tools.system.package_manager:mode' to 'install' in the [conf] " \
"section of the profile, or in the command line using " \
"'-c tools.system.package_manager:mode=install'"


@pytest.mark.parametrize("tool_class, result", [
@pytest.mark.parametrize("tool_class, result",
[
(Apt, "apt-get update"),
(Yum, "yum check-update -y"),
(Dnf, "dnf check-update -y"),
Expand All @@ -166,12 +148,18 @@ def test_tools_update_mode_install(tool_class, result):
conanfile.conf = Conf()
conanfile.settings = Settings()
conanfile.conf["tools.system.package_manager:tool"] = tool_class.tool_name
conanfile.conf["tools.system.package_manager:mode"] = "install"
with mock.patch('conans.ConanFile.context', new_callable=PropertyMock) as context_mock:
context_mock.return_value = "host"
tool = tool_class(conanfile)
tool.update()
assert tool._conanfile.command == result
for mode in ["check", "install"]:
conanfile.conf["tools.system.package_manager:mode"] = mode
with mock.patch('conans.ConanFile.context', new_callable=PropertyMock) as context_mock:
context_mock.return_value = "host"
tool = tool_class(conanfile)
tool.update()
if mode == "check":
assert f"Did not update '{str(tool_class.__name__)}'. To run the update operation " \
"set the 'tools.system.package_manager:mode' configuration " \
"to 'install'" in tool._conanfile.output
else:
assert tool._conanfile.command == result


@pytest.mark.parametrize("tool_class, result", [
Expand Down