[scripts/git-upload] Fix logic of --forbid-overwrite

2026-01-07 05:22:56 +00:00 · 2021-12-06 15:10:48 +03:00
parent 5293e183c5
commit 8388e14bbd
1 changed files with 8 additions and 8 deletions
--- a/scripts/git-upload
+++ b/scripts/git-upload
@@ -96,14 +96,14 @@ def do_copy(args):
    src = args.src
    dst = args.dst

-    try:
-        if src.is_dir():
-            shutil.copytree(src, dst)
-        else:
-            shutil.copy(src, dst)
-    except FileExistsError:
-        if args.forbid_overwrite:
-            raise
+    if args.forbid_overwrite and dst.exists():
+        raise FileExistsError(f"File exists: '{dst}'")
+
+    if src.is_dir():
+        shutil.rmtree(dst, ignore_errors=True)
+        shutil.copytree(src, dst)
+    else:
+        shutil.copy(src, dst)


 def main():