[tor-commits] [arm/master] fix: skipping torrc backup when for system copy

atagar at torproject.org atagar at torproject.org
Sat Aug 6 23:39:14 UTC 2011


commit 784d618b22a800f3abe148b0cb178b12cc7f3d05
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Jul 27 13:35:40 2011 -0700

    fix: skipping torrc backup when for system copy
    
    The wizard attempts to back up the torrc but, if we're editing the system copy,
    we'll lack the permissions for this. The override.py makes its own backup so
    this is fine.
---
 src/cli/wizard.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/cli/wizard.py b/src/cli/wizard.py
index 31f2f70..6d9d488 100644
--- a/src/cli/wizard.py
+++ b/src/cli/wizard.py
@@ -353,7 +353,7 @@ def showWizard():
           
           # if the torrc already exists then save it to a _bak file
           isBackedUp = False
-          if os.path.exists(torrcLocation):
+          if os.path.exists(torrcLocation) and not isSystemReplace:
             try:
               shutil.copy(torrcLocation, torrcLocation + "_bak")
               isBackedUp = True





More information about the tor-commits mailing list