about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2023-06-24 20:26:47 +0200
committerGitHub <noreply@github.com>2023-06-24 20:26:47 +0200
commit4d9ba1ac2feaccfeabb70e09fafeb02efcd56efc (patch)
tree98297c7296bf783974311038a1d1f26d423d7298
parent6b337684ed0ea02840ee4852f9d99d71087544a8 (diff)
parentf799e78d772abaf1df4c157b39d39b28d1602f41 (diff)
downloadrust-4d9ba1ac2feaccfeabb70e09fafeb02efcd56efc.tar.gz
rust-4d9ba1ac2feaccfeabb70e09fafeb02efcd56efc.zip
Rollup merge of #113003 - Nilstrieb:uh-yeah-so-about-that-deprecation-warning, r=jyn514
Fix old python deprecation check in x.py

The warning suppression variable was not checked correctly.

I tested it with python 2.7 and it worked correctly.
-rwxr-xr-xx.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/x.py b/x.py
index 7163df5cfe9..ba959a3047e 100755
--- a/x.py
+++ b/x.py
@@ -31,7 +31,7 @@ if __name__ == '__main__':
 
     # soft deprecation of old python versions
     skip_check = os.environ.get("RUST_IGNORE_OLD_PYTHON") == "1"
-    if major < 3 or (major == 3 and minor < 6):
+    if not skip_check and (major < 3 or (major == 3 and minor < 6)):
         msg = cleandoc("""
             Using python {}.{} but >= 3.6 is recommended. Your python version
             should continue to work for the near future, but this will