saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pkgbuild.repo: fix GPG signing with use_passphrase=False

Browse source
This commit is contained in:
Denys Havrysh 2016-10-21 10:52:46 +03:00
parent 96a1292a7e
commit 409a3100a7
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/debbuild.py
View file

@ -526,8 +526,8 @@ def make_repo(repodir,
.. versionadded:: 2016.3.0
Use a passphrase with the signing key presented in ``keyid``.
Passphrase is received from Pillar data which has been passed on
the command line. For example:
Passphrase is received from Pillar data which could be passed on the
command line with ``pillar`` parameter. For example:
.. code-block:: bash
@ -579,6 +579,7 @@ def make_repo(repodir,
local_fingerprint = None
local_keyid = None
phrase = ''
# preset passphase and interaction with gpg-agent
gpg_info_file = '{0}/gpg-agent-info-salt'.format(gnupghome)

7
salt/modules/rpmbuild.py
View file

@ -369,8 +369,8 @@ def make_repo(repodir,
.. versionadded:: 2016.3.0
Use a passphrase with the signing key presented in ``keyid``.
Passphrase is received from Pillar data which has been passed on
the command line. For example:
Passphrase is received from Pillar data which could be passed on the
command line with ``pillar`` parameter. For example:
.. code-block:: bash
@ -405,9 +405,10 @@ def make_repo(repodir,
'''
SIGN_PROMPT_RE = re.compile(r'Enter pass phrase: ', re.M)
local_keyid = None
define_gpg_name = ''
local_keyid = None
local_uids = None
phrase = ''
if keyid is not None:
## import_keys

4
salt/states/pkgbuild.py
View file

@ -336,8 +336,8 @@ def repo(name,
.. versionadded:: 2016.3.0
Use a passphrase with the signing key presented in ``keyid``.
Passphrase is received from Pillar data which has been passed on
the command line. For example:
Passphrase is received from Pillar data which could be passed on the
command line with ``pillar`` parameter. For example:
.. code-block:: bash