From a4c1ca48ad41a77103da96bfa2af985c2d556a4d Mon Sep 17 00:00:00 2001
From: FestplattenSchnitzel <festplatte.schnitzel@posteo.de>
Date: Sun, 5 Mar 2023 14:38:42 +0100
Subject: [PATCH] pylint: Reenable R1722 consider-using-sys-exit

* R1722: Consider using 'sys.exit' instead (consider-using-sys-exit)
---
 makebuildserver                   | 6 +++---
 pyproject.toml                    | 1 -
 tests/gradle-release-checksums.py | 5 +++--
 tests/ndk-release-checksums.py    | 7 ++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/makebuildserver b/makebuildserver
index 5d181b53..37889694 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -91,7 +91,7 @@ with open('buildserver/Vagrantfile') as fp:
     m = re.search(r"""\.vm\.box\s*=\s*["'](.*)["']""", fp.read())
     if not m:
         logging.error('Cannot find box name in buildserver/Vagrantfile!')
-        exit(1)
+        sys.exit(1)
     config['basebox'] = m.group(1)
 config['basebox_version'] = BASEBOX_VERSION_DEFAULT
 config['cachedir'] = os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver')
@@ -107,7 +107,7 @@ elif os.path.exists('makebs.config.py'):
 if show_config_deprecation:
     logging.error('Config is via %s and command line flags.' % configfile)
     parser.print_help()
-    exit(1)
+    sys.exit(1)
 
 logging.debug("Vagrantfile.yaml parsed -> %s", json.dumps(config, indent=4, sort_keys=True))
 
@@ -264,7 +264,7 @@ def main():
             logging.debug('found \'vmx\' or \'svm\' in /proc/cpuinfo -> hwvirtex = \'on\'')
         else:
             logging.error('hwvirtex = \'on\' and no \'vmx\' or \'svm\' found in /proc/cpuinfo!')
-            exit(1)
+            sys.exit(1)
 
     serverdir = os.path.join(os.getcwd(), 'buildserver')
     logfilename = os.path.join(serverdir, 'up.log')
diff --git a/pyproject.toml b/pyproject.toml
index 77104a0f..79fe9f3d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,6 @@ disable = [
   "broad-exception-caught",
   "broad-exception-raised",
   "consider-iterating-dictionary",
-  "consider-using-sys-exit",
   "invalid-name",
   "missing-class-docstring",
   "missing-function-docstring",
diff --git a/tests/gradle-release-checksums.py b/tests/gradle-release-checksums.py
index f020c0bd..1ec54c5f 100755
--- a/tests/gradle-release-checksums.py
+++ b/tests/gradle-release-checksums.py
@@ -6,6 +6,7 @@ import os
 import re
 import requests
 import subprocess
+import sys
 from colorama import Fore, Style
 from distutils.version import LooseVersion
 
@@ -92,7 +93,7 @@ with open('gradlew-fdroid', 'w') as fp:
 if os.getenv('CI_PROJECT_NAMESPACE') != 'fdroid':
     p = subprocess.run(['git', '--no-pager', 'diff'])
     print(p.stdout)
-    exit(errors)
+    sys.exit(errors)
 
 # This only runs after commits are pushed to fdroid/fdroidserver
 git_repo = git.repo.Repo('.')
@@ -103,7 +104,7 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in
         print(Fore.RED
               + 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!'
               + Style.RESET_ALL)
-        exit(1)
+        sys.exit(1)
 
     branch = git_repo.create_head(os.path.basename(__file__), force=True)
     branch.checkout()
diff --git a/tests/ndk-release-checksums.py b/tests/ndk-release-checksums.py
index b53d2387..97b7038b 100755
--- a/tests/ndk-release-checksums.py
+++ b/tests/ndk-release-checksums.py
@@ -7,6 +7,7 @@ import os
 import re
 import requests
 import subprocess
+import sys
 from colorama import Fore, Style
 
 
@@ -26,7 +27,7 @@ with open('fdroidserver/common.py') as fp:
 
 to_compile = re.search(r'\nNDKS = [^\]]+\]', common_py).group()
 if not to_compile:
-    exit(1)
+    sys.exit(1)
 code = compile(to_compile, '<string>', 'exec')
 config = {}
 exec(code, None, config)  # nosec this is just a CI script
@@ -78,7 +79,7 @@ with open('fdroidserver/common.py', 'w') as fp:
 if os.getenv('CI_PROJECT_NAMESPACE') != 'fdroid':
     p = subprocess.run(['git', '--no-pager', 'diff'])
     print(p.stdout)
-    exit(errors)
+    sys.exit(errors)
 
 
 # This only runs after commits are pushed to fdroid/fdroidserver
@@ -114,7 +115,7 @@ if git_repo.is_dirty() and 'fdroidserver/common.py' in modified:
             + 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!'
             + Style.RESET_ALL
         )
-        exit(1)
+        sys.exit(1)
     gl = gitlab.Gitlab(
         os.getenv('CI_SERVER_URL'), api_version=4, private_token=private_token
     )