Date: Mon, 24 Apr 2017 13:09:34 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439289 - in head/sysutils/py-salt: . files Message-ID: <201704241309.v3OD9YbM073078@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Mon Apr 24 13:09:34 2017 New Revision: 439289 URL: https://svnweb.freebsd.org/changeset/ports/439289 Log: 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) Added: head/sysutils/py-salt/files/patch-salt_modules_pw__user.py (contents, props changed) Modified: head/sysutils/py-salt/Makefile Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Mon Apr 24 13:00:16 2017 (r439288) +++ head/sysutils/py-salt/Makefile Mon Apr 24 13:09:34 2017 (r439289) @@ -3,6 +3,7 @@ PORTNAME= salt PORTVERSION= 2016.11.3 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Added: head/sysutils/py-salt/files/patch-salt_modules_pw__user.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt_modules_pw__user.py Mon Apr 24 13:09:34 2017 (r439289) @@ -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):
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704241309.v3OD9YbM073078>