Skip to content

Fix aptpkg systemd call (bsc#1143301) #54077

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

Closed
dincamihai wants to merge 3 commits into from
Closed

Fix aptpkg systemd call (bsc#1143301) #54077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a2d243
Fix aptpkg systemd call (bsc#1143301)
Jul 31, 2019
f1ca60e
Update salt/modules/aptpkg.py
dincamihai Oct 28, 2019
adac1a4
Update tests/unit/modules/test_aptpkg.py
dincamihai Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/modules/aptpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def _call_apt(args, scope=True, **kwargs):
'''
cmd = []
if scope and salt.utils.systemd.has_scope(__context__) and __salt__['config.get']('systemd.scope', True):
cmd.extend(['systemd-run', '--scope'])
cmd.extend(['systemd-run', '--scope', '--description', '"{0}"'.format(__name__)])
cmd.extend(args)

params = {'output_loglevel': 'trace',
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/modules/test_aptpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def test_call_apt_in_scope(self):
with patch.dict(aptpkg.__salt__, {'cmd.run_all': MagicMock(), 'config.get': MagicMock(return_value=True)}):
aptpkg._call_apt(['apt-get', 'purge', 'vim']) # pylint: disable=W0106
aptpkg.__salt__['cmd.run_all'].assert_called_once_with(
['systemd-run', '--scope', 'apt-get', 'purge', 'vim'], env={},
['systemd-run', '--scope', '--description', '"salt.modules.aptpkg"', 'apt-get', 'purge', 'vim'], env={},
output_loglevel='trace', python_shell=False)

def test_call_apt_with_kwargs(self):
Expand Down