From c1f8c7daf174817cd6198064adfa7e4714e80c3d Mon Sep 17 00:00:00 2001 From: Loren Rogers Date: Wed, 30 Nov 2016 22:32:16 -0500 Subject: [PATCH] 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. --- qvm-tools/qvm-clone | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qvm-tools/qvm-clone b/qvm-tools/qvm-clone index 5ec22c5c..af0a5227 100755 --- a/qvm-tools/qvm-clone +++ b/qvm-tools/qvm-clone @@ -51,11 +51,10 @@ def main(): if hasattr(os, "geteuid") and os.geteuid() == 0: if not options.force_root: - print >> sys.stderr, "*** Running this tool as root is" + \ - " strongly discouraged, this will lead you in permissions" + \ - "problems." - print >> sys.stderr, "Retry as unprivileged user." - print >> sys.stderr, "... or use --force-root to continue anyway." + print >> sys.stderr, "WARNING: Running this tool as root can lead to" + \ + " permission problems and is strongly discouraged. Please" + \ + " retry as an unprivileged user or use --force-root to" + \ + " continue anyway." exit(1) qvm_collection = QubesVmCollection()