[tor-commits] [tor/master] practracker: use shutil.move so --regen will work on windows

nickm at torproject.org nickm at torproject.org
Thu Feb 6 13:27:23 UTC 2020


commit 5e963f97b1e70012e0917ce160b1579a87ab9bcb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 3 13:36:56 2020 -0500

    practracker: use shutil.move so --regen will work on windows
    
    On windows you can't os.rename() a file if the target filename
    already exists.
---
 scripts/maint/practracker/practracker.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py
index 3f40f63c4..6149fb79c 100755
--- a/scripts/maint/practracker/practracker.py
+++ b/scripts/maint/practracker/practracker.py
@@ -30,6 +30,7 @@ import metrics
 import util
 import problem
 import includes
+import shutil
 
 # The filename of the exceptions file (it should be placed in the practracker directory)
 EXCEPTIONS_FNAME = "./exceptions.txt"
@@ -275,7 +276,7 @@ def main(argv):
 
     if args.regen:
         tmpfile.close()
-        os.rename(tmpname, exceptions_file)
+        shutil.move(tmpname, exceptions_file)
         sys.exit(0)
 
     if args.regen_overbroad:
@@ -285,7 +286,7 @@ def main(argv):
         for item in ProblemVault.list_exceptions_without_overbroad():
             print(item, file=tmpfile)
         tmpfile.close()
-        os.rename(tmpname, exceptions_file)
+        shutil.move(tmpname, exceptions_file)
         sys.exit(0)
 
     # If new issues were found, try to give out some advice to the developer on how to resolve it.





More information about the tor-commits mailing list