rattail/rattail
2
0
Fork 0
Code Issues 7 Pull requests Actions Packages Projects Releases Wiki Activity

Tweak how we assign 'runas' user for commands

Browse source
This commit is contained in:
Lance Edgar 2018-11-19 21:27:57 -06:00
parent d3f327e396
commit 6207645f29
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rattail/commands/core.py
View file

@ -357,7 +357,10 @@ class Subcommand(object):
from rattail.db.util import short_session from rattail.db.util import short_session
if username is None: if username is None:
username = self.runas_username or self.config.require('rattail', 'runas.default') if hasattr(self, 'runas_username'):
username = self.runas_username
if not username:
username = self.config.require('rattail', 'runas.default')
with short_session(session) as s: with short_session(session) as s:
user = s.query(self.model.User).filter_by(username=username).one() user = s.query(self.model.User).filter_by(username=username).one()
if not session: if not session:

6
rattail/commands/importing.py
View file

@ -71,9 +71,9 @@ class ImportSubcommand(Subcommand):
kwargs.setdefault('config', getattr(self, 'config', None)) kwargs.setdefault('config', getattr(self, 'config', None))
kwargs.setdefault('command', self) kwargs.setdefault('command', self)
kwargs.setdefault('progress', self.progress) kwargs.setdefault('progress', self.progress)
if hasattr(self, 'runas_username'): user = self.get_runas_user()
kwargs.setdefault('runas_username', self.runas_username) kwargs.setdefault('runas_user', user)
kwargs.setdefault('runas_user', self.get_runas_user()) kwargs.setdefault('runas_username', user.username)
if 'args' in kwargs: if 'args' in kwargs:
args = kwargs['args'] args = kwargs['args']
kwargs.setdefault('dry_run', args.dry_run) kwargs.setdefault('dry_run', args.dry_run)