commit 8a6099a62642b919a90e21fff0638ba30ab8f552 Author: Damian Johnson atagar@torproject.org Date: Sat May 14 13:04:49 2011 -0700
Adding the quiet flag to torctl fetches
I was suppressing 'git clone' stdout on my local system but this wasn't working on others. Adding the --quiet flag which is a better solution anyway. --- src/prereq.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/prereq.py b/src/prereq.py index 50aaa91..4bda913 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -23,7 +23,7 @@ def isTorCtlAvailable(): def promptTorCtlInstall(): """ Asks the user to install TorCtl. This returns True if it was installed and - False otherwise (if it was either declined or failed to be fetched. + False otherwise (if it was either declined or failed to be fetched). """
userInput = raw_input("Arm requires TorCtl to run, but it's unavailable. Would you like to install it? (y/n): ") @@ -57,7 +57,7 @@ def installTorCtl(): tmpFilename = tempfile.mktemp("/torctl")
# fetches TorCtl - exitStatus = os.system("git clone %s %s > /dev/null" % (TORCTL_REPO, tmpFilename)) + exitStatus = os.system("git clone --quiet %s %s > /dev/null" % (TORCTL_REPO, tmpFilename)) if exitStatus: raise IOError("Unable to get TorCtl from %s. Is git installed?" % TORCTL_REPO)
# the destination for TorCtl will be our directory