openstack/manila
Code Issues Proposed changes

Merge "Don't attempt to escalate manila-manage privileges"

Browse Source
This commit is contained in:
Zuul 2018-03-25 05:19:11 +00:00 committed by Gerrit Code Review
commit 1a65c16fab
1 changed files with 3 additions and 11 deletions

14
manila/cmd/manage.py

@ -447,17 +447,9 @@ def main():
CONF(sys.argv[1:], project='manila', CONF(sys.argv[1:], project='manila',
version=version.version_string()) version=version.version_string())
log.setup(CONF, "manila") log.setup(CONF, "manila")
except cfg.ConfigFilesNotFoundError: except cfg.ConfigFilesNotFoundError as e:
cfgfile = CONF.config_file[-1] if CONF.config_file else None cfg_files = e.config_files
if cfgfile and not os.access(cfgfile, os.R_OK): print(_("Failed to read configuration file(s): %s") % cfg_files)
st = os.stat(cfgfile)
print(_("Could not read %s. Re-running with sudo") % cfgfile)
try:
os.execvp('sudo', ['sudo', '-u', '#%s' % st.st_uid] + sys.argv)
except Exception:
print(_('sudo failed, continuing as if nothing happened'))
print(_('Please re-run manila-manage as root.'))
sys.exit(2) sys.exit(2)
fn = CONF.category.action_fn fn = CONF.category.action_fn