valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19537 from rallytime/bp-19344

Browse Source 
Backport #19344 to 2014.7
This commit is contained in:
Thomas S Hatch 2015-01-08 16:44:35 -07:00
commit 081c96c43f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/svn.py
View File

@ -212,14 +212,14 @@ def export(name,
ret, ret,
('{0} doesn\'t exist and is set to be checked out.').format(target)) ('{0} doesn\'t exist and is set to be checked out.').format(target))
svn_cmd = 'svn.list' svn_cmd = 'svn.list'
opts += ('-r', 'HEAD') rev = 'HEAD'
out = __salt__[svn_cmd](cwd, target, user, username, password, *opts) out = __salt__[svn_cmd](cwd, target, user, username, password, *opts)
return _neutral_test( return _neutral_test(
ret, ret,
('{0}').format(out)) ('{0}').format(out))
if rev: if not rev:
opts += ('-r', str(rev)) rev = 'HEAD'
if force: if force:
opts += ('--force',) opts += ('--force',)
@ -230,7 +230,7 @@ def export(name,
if trust: if trust:
opts += ('--trust-server-cert',) opts += ('--trust-server-cert',)
out = __salt__[svn_cmd](cwd, name, basename, user, username, password, *opts) out = __salt__[svn_cmd](cwd, name, basename, user, username, password, rev, *opts)
ret['changes'] = name + ' was Exported to ' + target ret['changes'] = name + ' was Exported to ' + target
return ret return ret