about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-04-19 17:54:39 +0200
committerGitHub <noreply@github.com>2023-04-19 17:54:39 +0200
commit73bfa18613c17266e96ebb48aa55ecbe8a6a52c1 (patch)
tree3287f8e4e743438895dde205ee847285726967fe
parent3a5c8e91f094bb1cb1346651fe3512f0b603d826 (diff)
parent010d7975d61b7437ef26d8e08f70afde2cb5e85a (diff)
downloadrust-73bfa18613c17266e96ebb48aa55ecbe8a6a52c1.tar.gz
rust-73bfa18613c17266e96ebb48aa55ecbe8a6a52c1.zip
Rollup merge of #110123 - madsravn:master, r=jyn514
'./configure' now checks if 'config.toml' exists before writing to that destination

Fixes #110109

Instead of overwriting the current `config.toml` file, exit the `./configure` script with a message stating why.
-rwxr-xr-xsrc/bootstrap/configure.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
index abd28b4005d..782bb6cf36f 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -521,8 +521,14 @@ def write_config_toml(writer, section_order, targets, sections):
         else:
             writer = write_uncommented(sections[section], writer)
 
+def quit_if_file_exists(file):
+    if os.path.isfile(file):
+        err("Existing '" + file + "' detected.")
 
 if __name__ == "__main__":
+    # If 'config.toml' already exists, exit the script at this point
+    quit_if_file_exists('config.toml')
+
     p("processing command line")
     # Parse all known arguments into a configuration structure that reflects the
     # TOML we're going to write out