Merge pull request #51680 from Ch3LL/bp-50336

Backport #50336 into 2018.3
saltstack · Feb 16, 2019 · b8764fd · b8764fd
2 parents a8898f6 + 3502dbb
commit b8764fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py
@@ -924,7 +924,7 @@ def trust_key(keyid=None,
 
     if user == 'salt':
         homeDir = os.path.join(__salt__['config.get']('config_dir'), 'gpgkeys')
-        cmd.extend([' --homedir', homeDir])
+        cmd.extend(['--homedir', homeDir])
         _user = 'root'
     res = __salt__['cmd.run_all'](cmd,
                                   stdin=stdin,

diff --git a/salt/states/gpg.py b/salt/states/gpg.py
@@ -70,7 +70,7 @@ def present(name,
            'changes': {},
            'comment': []}
 
-    _current_keys = __salt__['gpg.list_keys']()
+    _current_keys = __salt__['gpg.list_keys'](user=user, gnupghome=gnupghome)
 
     current_keys = {}
     for key in _current_keys: