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

Merge pull request #45686 from bdrung/2017.7

Browse source 
Use dbus-run-session instead of dbus-launch
This commit is contained in:
Nicole Thomas 2018-01-29 09:24:10 -05:00 • committed by GitHub
commit 79da49ec8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/modules/gnomedesktop.py
View file

@ -20,6 +20,7 @@ try:
except ImportError:
HAS_GLIB = False
import salt.utils
log = logging.getLogger(__name__)
@ -50,6 +51,17 @@ class _GSettings(object):
self.UID = None
self.HOME = None
@property
def gestting_command(self):
'''
return the command to run the gesttings binary
'''
if salt.utils.which_bin(['dbus-run-session']):
cmd = ['dbus-run-session', '--', 'gsettings']
else:
cmd = ['dbus-launch', '--exit-with-session', 'gsettings']
return cmd
def _get(self):
'''
get the value for user in gsettings
@ -62,7 +74,7 @@ class _GSettings(object):
log.info('User does not exist')
return False
cmd = 'dbus-launch --exit-with-session gsettings get {0} {1}'.format(self.SCHEMA, self.KEY)
cmd = self.gestting_command + ['get', str(self.SCHEMA), str(self.KEY)]
environ = {}
environ['XDG_RUNTIME_DIR'] = '/run/user/{0}'.format(uid)
result = __salt__['cmd.run_all'](cmd, runas=user, env=environ, python_shell=False)
@ -90,7 +102,7 @@ class _GSettings(object):
result['stdout'] = 'User {0} does not exist'.format(user)
return result
cmd = 'dbus-launch --exit-with-session gsettings set {0} {1} "{2}"'.format(self.SCHEMA, self.KEY, str(value))
cmd = self.gestting_command + ['set', str(self.SCHEMA), str(self.KEY), str(value)]
environ = {}
environ['XDG_RUNTIME_DIR'] = '/run/user/{0}'.format(uid)
result = __salt__['cmd.run_all'](cmd, runas=user, env=environ, python_shell=False)