Rewrite root error message

The language for this was very strange, so I rewrote it in a more standard format. Instead of printing things across three functions, I consolidated into one. I also opted for the more standard "WARNING:" instead of "***", which I've not seen before.
This commit is contained in:
Loren Rogers 2016-11-30 22:32:16 -05:00 committed by GitHub
parent 1b12df379c
commit c1f8c7daf1

View File

@ -51,11 +51,10 @@ def main():
if hasattr(os, "geteuid") and os.geteuid() == 0: if hasattr(os, "geteuid") and os.geteuid() == 0:
if not options.force_root: if not options.force_root:
print >> sys.stderr, "*** Running this tool as root is" + \ print >> sys.stderr, "WARNING: Running this tool as root can lead to" + \
" strongly discouraged, this will lead you in permissions" + \ " permission problems and is strongly discouraged. Please" + \
"problems." " retry as an unprivileged user or use --force-root to" + \
print >> sys.stderr, "Retry as unprivileged user." " continue anyway."
print >> sys.stderr, "... or use --force-root to continue anyway."
exit(1) exit(1)
qvm_collection = QubesVmCollection() qvm_collection = QubesVmCollection()