Fix sudo/doas

Fixes #227
This commit is contained in:
Ivan Shvedunov 2018-05-13 13:00:35 +03:00 committed by Brian May
parent ae5bd28dcf
commit 2bb92cd6d4

View File

@ -198,10 +198,11 @@ class FirewallClient:
['--firewall']) ['--firewall'])
if ssyslog._p: if ssyslog._p:
argvbase += ['--syslog'] argvbase += ['--syslog']
argv_tries = [ elev_prefix = [part % {'eb': elevbin, 'pp': python_path}
['%(eb)s', '-p', '[local %(eb)s] Password: ', '/usr/bin/env', for part in ['%(eb)s', '-p',
('PYTHONPATH=%(pp)s' % {'eb': elevbin, 'pp': python_path})] + '[local %(eb)s] Password: ',
argvbase, argvbase] '/usr/bin/env', 'PYTHONPATH=%(pp)s']]
argv_tries = [elev_prefix + argvbase, argvbase]
# we can't use stdin/stdout=subprocess.PIPE here, as we normally would, # we can't use stdin/stdout=subprocess.PIPE here, as we normally would,
# because stupid Linux 'su' requires that stdin be attached to a tty. # because stupid Linux 'su' requires that stdin be attached to a tty.