65598582f5
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=179
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 5dadda6822323f409c99112244c2c809e58126e1 Mon Sep 17 00:00:00 2001
|
|
From: Mihai Dinca <mdinca@suse.de>
|
|
Date: Wed, 31 Jul 2019 15:29:03 +0200
|
|
Subject: [PATCH] Fix aptpkg systemd call (bsc#1143301)
|
|
|
|
---
|
|
salt/modules/aptpkg.py | 2 +-
|
|
tests/unit/modules/test_aptpkg.py | 3 +--
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py
|
|
index bf90d0614f..c47ee852f4 100644
|
|
--- a/salt/modules/aptpkg.py
|
|
+++ b/salt/modules/aptpkg.py
|
|
@@ -160,7 +160,7 @@ def _call_apt(args, scope=True, **kwargs):
|
|
and salt.utils.systemd.has_scope(__context__)
|
|
and __salt__["config.get"]("systemd.scope", True)
|
|
):
|
|
- cmd.extend(["systemd-run", "--scope", "--description", '"{}"'.format(__name__)])
|
|
+ cmd.extend(["systemd-run", "--scope", '--description "{}"'.format(__name__)])
|
|
cmd.extend(args)
|
|
|
|
params = {
|
|
diff --git a/tests/unit/modules/test_aptpkg.py b/tests/unit/modules/test_aptpkg.py
|
|
index 77d8b84896..c3769a7df1 100644
|
|
--- a/tests/unit/modules/test_aptpkg.py
|
|
+++ b/tests/unit/modules/test_aptpkg.py
|
|
@@ -896,8 +896,7 @@ class AptUtilsTestCase(TestCase, LoaderModuleMockMixin):
|
|
[
|
|
"systemd-run",
|
|
"--scope",
|
|
- "--description",
|
|
- '"salt.modules.aptpkg"',
|
|
+ '--description "salt.modules.aptpkg"',
|
|
"apt-get",
|
|
"purge",
|
|
"vim",
|
|
--
|
|
2.29.2
|
|
|
|
|