"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "salt/modules/git.py" between
salt-2019.2.0.tar.gz and salt-2019.2.1.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

git.py  (salt-2019.2.0):git.py  (salt-2019.2.1)
skipping to change at line 965 skipping to change at line 965
Path to a private key to use for ssh URLs Path to a private key to use for ssh URLs
.. warning:: .. warning::
Unless Salt is invoked from the minion using ``salt-call``, the Unless Salt is invoked from the minion using ``salt-call``, the
key(s) must be passphraseless. For greater security with key(s) must be passphraseless. For greater security with
passphraseless private keys, see the `sshd(8)`_ manpage for passphraseless private keys, see the `sshd(8)`_ manpage for
information on securing the keypair from the remote side in the information on securing the keypair from the remote side in the
``authorized_keys`` file. ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE%20FORMAT .. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE_FORMAT
.. versionchanged:: 2015.8.7 .. versionchanged:: 2015.8.7
Salt will no longer attempt to use passphrase-protected keys unless Salt will no longer attempt to use passphrase-protected keys unless
invoked from the minion using ``salt-call``, to prevent blocking invoked from the minion using ``salt-call``, to prevent blocking
waiting for user input. waiting for user input.
Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file
.. versionchanged:: 2016.3.0 .. versionchanged:: 2016.3.0
skipping to change at line 2068 skipping to change at line 2068
Path to a private key to use for ssh URLs Path to a private key to use for ssh URLs
.. warning:: .. warning::
Unless Salt is invoked from the minion using ``salt-call``, the Unless Salt is invoked from the minion using ``salt-call``, the
key(s) must be passphraseless. For greater security with key(s) must be passphraseless. For greater security with
passphraseless private keys, see the `sshd(8)`_ manpage for passphraseless private keys, see the `sshd(8)`_ manpage for
information on securing the keypair from the remote side in the information on securing the keypair from the remote side in the
``authorized_keys`` file. ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE%20FORMAT .. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE_FORMAT
.. versionchanged:: 2015.8.7 .. versionchanged:: 2015.8.7
Salt will no longer attempt to use passphrase-protected keys unless Salt will no longer attempt to use passphrase-protected keys unless
invoked from the minion using ``salt-call``, to prevent blocking invoked from the minion using ``salt-call``, to prevent blocking
waiting for user input. waiting for user input.
Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file
.. versionchanged:: 2016.3.0 .. versionchanged:: 2016.3.0
skipping to change at line 2873 skipping to change at line 2873
Path to a private key to use for ssh URLs Path to a private key to use for ssh URLs
.. warning:: .. warning::
Unless Salt is invoked from the minion using ``salt-call``, the Unless Salt is invoked from the minion using ``salt-call``, the
key(s) must be passphraseless. For greater security with key(s) must be passphraseless. For greater security with
passphraseless private keys, see the `sshd(8)`_ manpage for passphraseless private keys, see the `sshd(8)`_ manpage for
information on securing the keypair from the remote side in the information on securing the keypair from the remote side in the
``authorized_keys`` file. ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE%20FORMAT .. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE_FORMAT
.. versionchanged:: 2015.8.7 .. versionchanged:: 2015.8.7
Salt will no longer attempt to use passphrase-protected keys unless Salt will no longer attempt to use passphrase-protected keys unless
invoked from the minion using ``salt-call``, to prevent blocking invoked from the minion using ``salt-call``, to prevent blocking
waiting for user input. waiting for user input.
Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file
.. versionchanged:: 2016.3.0 .. versionchanged:: 2016.3.0
skipping to change at line 2965 skipping to change at line 2965
continue continue
ret[ref_name] = ref_sha1 ret[ref_name] = ref_sha1
return ret return ret
def merge(cwd, def merge(cwd,
rev=None, rev=None,
opts='', opts='',
git_opts='', git_opts='',
user=None, user=None,
password=None, password=None,
identity=None,
ignore_retcode=False, ignore_retcode=False,
output_encoding=None, output_encoding=None,
**kwargs): **kwargs):
''' '''
Interface to `git-merge(1)`_ Interface to `git-merge(1)`_
cwd cwd
The path to the git checkout The path to the git checkout
rev rev
skipping to change at line 3008 skipping to change at line 3009
user user
User under which to run the git command. By default, the command is run User under which to run the git command. By default, the command is run
by the user under which the minion is running. by the user under which the minion is running.
password password
Windows only. Required when specifying ``user``. This parameter will be Windows only. Required when specifying ``user``. This parameter will be
ignored on non-Windows platforms. ignored on non-Windows platforms.
.. versionadded:: 2016.3.4 .. versionadded:: 2016.3.4
identity
Path to a private key to use for ssh URLs. Salt will not attempt to use
passphrase-protected keys unless invoked from the minion using
``salt-call``, to prevent blocking waiting for user input. Key can also
be specified as a SaltStack file server URL, eg.
``salt://location/identity_file``.
.. note::
For greater security with passphraseless private keys, see the
`sshd(8)`_ manpage for information on securing the keypair from the
remote side in the ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html#
AUTHORIZED_KEYS_FILE_FORMAT
.. versionadded:: 2018.3.5,2019.2.1,Neon
ignore_retcode : False ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command If ``True``, do not log an error to the minion log if the git command
returns a nonzero exit status. returns a nonzero exit status.
.. versionadded:: 2015.8.0 .. versionadded:: 2015.8.0
output_encoding output_encoding
Use this option to specify which encoding to use to decode the output Use this option to specify which encoding to use to decode the output
from any git commands which are run. This should not be needed in most from any git commands which are run. This should not be needed in most
cases. cases.
skipping to change at line 3049 skipping to change at line 3066
kwargs = salt.utils.args.clean_kwargs(**kwargs) kwargs = salt.utils.args.clean_kwargs(**kwargs)
if kwargs: if kwargs:
salt.utils.args.invalid_kwargs(kwargs) salt.utils.args.invalid_kwargs(kwargs)
cwd = _expand_path(cwd, user) cwd = _expand_path(cwd, user)
command = ['git'] + _format_git_opts(git_opts) command = ['git'] + _format_git_opts(git_opts)
command.append('merge') command.append('merge')
command.extend(_format_opts(opts)) command.extend(_format_opts(opts))
if rev: if rev:
command.append(rev) command.append(rev)
return _git_run(command, return _git_run(command,
cwd=cwd, cwd=cwd,
user=user, user=user,
password=password, password=password,
identity=identity,
ignore_retcode=ignore_retcode, ignore_retcode=ignore_retcode,
output_encoding=output_encoding)['stdout'] output_encoding=output_encoding)['stdout']
def merge_base(cwd, def merge_base(cwd,
refs=None, refs=None,
octopus=False, octopus=False,
is_ancestor=False, is_ancestor=False,
independent=False, independent=False,
fork_point=None, fork_point=None,
opts='', opts='',
skipping to change at line 3404 skipping to change at line 3423
Path to a private key to use for ssh URLs Path to a private key to use for ssh URLs
.. warning:: .. warning::
Unless Salt is invoked from the minion using ``salt-call``, the Unless Salt is invoked from the minion using ``salt-call``, the
key(s) must be passphraseless. For greater security with key(s) must be passphraseless. For greater security with
passphraseless private keys, see the `sshd(8)`_ manpage for passphraseless private keys, see the `sshd(8)`_ manpage for
information on securing the keypair from the remote side in the information on securing the keypair from the remote side in the
``authorized_keys`` file. ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE%20FORMAT .. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE_FORMAT
.. versionchanged:: 2015.8.7 .. versionchanged:: 2015.8.7
Salt will no longer attempt to use passphrase-protected keys unless Salt will no longer attempt to use passphrase-protected keys unless
invoked from the minion using ``salt-call``, to prevent blocking invoked from the minion using ``salt-call``, to prevent blocking
waiting for user input. waiting for user input.
Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file
.. versionchanged:: 2016.3.0 .. versionchanged:: 2016.3.0
skipping to change at line 3529 skipping to change at line 3548
Path to a private key to use for ssh URLs Path to a private key to use for ssh URLs
.. warning:: .. warning::
Unless Salt is invoked from the minion using ``salt-call``, the Unless Salt is invoked from the minion using ``salt-call``, the
key(s) must be passphraseless. For greater security with key(s) must be passphraseless. For greater security with
passphraseless private keys, see the `sshd(8)`_ manpage for passphraseless private keys, see the `sshd(8)`_ manpage for
information on securing the keypair from the remote side in the information on securing the keypair from the remote side in the
``authorized_keys`` file. ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE%20FORMAT .. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE_FORMAT
.. versionchanged:: 2015.8.7 .. versionchanged:: 2015.8.7
Salt will no longer attempt to use passphrase-protected keys unless Salt will no longer attempt to use passphrase-protected keys unless
invoked from the minion using ``salt-call``, to prevent blocking invoked from the minion using ``salt-call``, to prevent blocking
waiting for user input. waiting for user input.
Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file
.. versionchanged:: 2016.3.0 .. versionchanged:: 2016.3.0
skipping to change at line 3817 skipping to change at line 3836
Path to a private key to use for ssh URLs Path to a private key to use for ssh URLs
.. warning:: .. warning::
Unless Salt is invoked from the minion using ``salt-call``, the Unless Salt is invoked from the minion using ``salt-call``, the
key(s) must be passphraseless. For greater security with key(s) must be passphraseless. For greater security with
passphraseless private keys, see the `sshd(8)`_ manpage for passphraseless private keys, see the `sshd(8)`_ manpage for
information on securing the keypair from the remote side in the information on securing the keypair from the remote side in the
``authorized_keys`` file. ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE%20FORMAT .. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE_FORMAT
.. versionchanged:: 2015.8.7 .. versionchanged:: 2015.8.7
Salt will no longer attempt to use passphrase-protected keys unless Salt will no longer attempt to use passphrase-protected keys unless
invoked from the minion using ``salt-call``, to prevent blocking invoked from the minion using ``salt-call``, to prevent blocking
waiting for user input. waiting for user input.
Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file
.. versionchanged:: 2016.3.0 .. versionchanged:: 2016.3.0
skipping to change at line 4131 skipping to change at line 4150
if redact_auth: if redact_auth:
remote_url = salt.utils.url.redact_http_basic_auth(remote_url) remote_url = salt.utils.url.redact_http_basic_auth(remote_url)
ret.setdefault(remote, {})[action] = remote_url ret.setdefault(remote, {})[action] = remote_url
return ret return ret
def reset(cwd, def reset(cwd,
opts='', opts='',
git_opts='', git_opts='',
user=None, user=None,
password=None, password=None,
identity=None,
ignore_retcode=False, ignore_retcode=False,
output_encoding=None): output_encoding=None):
''' '''
Interface to `git-reset(1)`_, returns the stdout from the git command Interface to `git-reset(1)`_, returns the stdout from the git command
cwd cwd
The path to the git checkout The path to the git checkout
opts opts
Any additional options to add to the command line, in a single string Any additional options to add to the command line, in a single string
skipping to change at line 4167 skipping to change at line 4187
user user
User under which to run the git command. By default, the command is run User under which to run the git command. By default, the command is run
by the user under which the minion is running. by the user under which the minion is running.
password password
Windows only. Required when specifying ``user``. This parameter will be Windows only. Required when specifying ``user``. This parameter will be
ignored on non-Windows platforms. ignored on non-Windows platforms.
.. versionadded:: 2016.3.4 .. versionadded:: 2016.3.4
identity
Path to a private key to use for ssh URLs. Salt will not attempt to use
passphrase-protected keys unless invoked from the minion using
``salt-call``, to prevent blocking waiting for user input. Key can also
be specified as a SaltStack file server URL, eg.
``salt://location/identity_file``.
.. note::
For greater security with passphraseless private keys, see the
`sshd(8)`_ manpage for information on securing the keypair from the
remote side in the ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html#
AUTHORIZED_KEYS_FILE_FORMAT
.. versionadded:: 2018.3.5,2019.2.1,Neon
ignore_retcode : False ignore_retcode : False
If ``True``, do not log an error to the minion log if the git command If ``True``, do not log an error to the minion log if the git command
returns a nonzero exit status. returns a nonzero exit status.
.. versionadded:: 2015.8.0 .. versionadded:: 2015.8.0
output_encoding output_encoding
Use this option to specify which encoding to use to decode the output Use this option to specify which encoding to use to decode the output
from any git commands which are run. This should not be needed in most from any git commands which are run. This should not be needed in most
cases. cases.
skipping to change at line 4204 skipping to change at line 4240
salt myminion git.reset /path/to/repo opts='--hard origin/master' salt myminion git.reset /path/to/repo opts='--hard origin/master'
''' '''
cwd = _expand_path(cwd, user) cwd = _expand_path(cwd, user)
command = ['git'] + _format_git_opts(git_opts) command = ['git'] + _format_git_opts(git_opts)
command.append('reset') command.append('reset')
command.extend(_format_opts(opts)) command.extend(_format_opts(opts))
return _git_run(command, return _git_run(command,
cwd=cwd, cwd=cwd,
user=user, user=user,
password=password, password=password,
identity=identity,
ignore_retcode=ignore_retcode, ignore_retcode=ignore_retcode,
output_encoding=output_encoding)['stdout'] output_encoding=output_encoding)['stdout']
def rev_parse(cwd, def rev_parse(cwd,
rev=None, rev=None,
opts='', opts='',
git_opts='', git_opts='',
user=None, user=None,
password=None, password=None,
ignore_retcode=False, ignore_retcode=False,
skipping to change at line 4686 skipping to change at line 4723
Path to a private key to use for ssh URLs Path to a private key to use for ssh URLs
.. warning:: .. warning::
Unless Salt is invoked from the minion using ``salt-call``, the Unless Salt is invoked from the minion using ``salt-call``, the
key(s) must be passphraseless. For greater security with key(s) must be passphraseless. For greater security with
passphraseless private keys, see the `sshd(8)`_ manpage for passphraseless private keys, see the `sshd(8)`_ manpage for
information on securing the keypair from the remote side in the information on securing the keypair from the remote side in the
``authorized_keys`` file. ``authorized_keys`` file.
.. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE%20FORMAT .. _`sshd(8)`: http://www.man7.org/linux/man-pages/man8/sshd.8.html# AUTHORIZED_KEYS_FILE_FORMAT
.. versionchanged:: 2015.8.7 .. versionchanged:: 2015.8.7
Salt will no longer attempt to use passphrase-protected keys unless Salt will no longer attempt to use passphrase-protected keys unless
invoked from the minion using ``salt-call``, to prevent blocking invoked from the minion using ``salt-call``, to prevent blocking
waiting for user input. waiting for user input.
Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file Key can also be specified as a SaltStack file server URL, eg. salt://loc ation/identity_file
.. versionchanged:: 2016.3.0 .. versionchanged:: 2016.3.0
 End of changes. 14 change blocks. 
7 lines changed or deleted 46 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)