diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2017-04-24 13:09:34 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2017-04-24 13:09:34 +0000 |
| commit | 516254aa685ff60b3ae28b8f1391d9b686a8576d (patch) | |
| tree | 86feb9dd1f4c90da41a3fd8c2f39b06a7faff80e /sysutils/py-salt/files | |
| parent | Only strip shared libraries if we are actually install them. (diff) | |
sysutils/py-salt: Make salt.modules.pw_user.get_loginclass return string
rather than dict.
This fixes salt.modules.pw_user.chloginclass which is used for FreeBSD
and expects a string to be returned. This was therefore returning False
even after successfully changing the loginclass.
This also fixes salt.states.user.present on FreeBSD when loginclass is
set.
PR: 218694
Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=439289
Diffstat (limited to 'sysutils/py-salt/files')
| -rw-r--r-- | sysutils/py-salt/files/patch-salt_modules_pw__user.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sysutils/py-salt/files/patch-salt_modules_pw__user.py b/sysutils/py-salt/files/patch-salt_modules_pw__user.py new file mode 100644 index 000000000000..17ce4edbd073 --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_modules_pw__user.py @@ -0,0 +1,11 @@ +--- salt/modules/pw_user.py.orig 2017-04-17 04:36:14 UTC ++++ salt/modules/pw_user.py +@@ -475,7 +475,7 @@ def get_loginclass(name): + userinfo = __salt__['cmd.run_stdout'](['pw', 'usershow', '-n', name]) + userinfo = userinfo.split(':') + +- return {'loginclass': userinfo[4] if len(userinfo) == 10 else ''} ++ return userinfo[4] if len(userinfo) == 10 else '' + + + def list_groups(name): |