Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan M. Taylor <dylan@dylanmtaylor.com>2022-02-12 17:42:48 -0500
committerGitHub <noreply@github.com>2022-02-12 23:42:48 +0100
commita741b1a5306ee203203ca1dbc33add2c512f8dcc (patch)
tree5356f3f4922c2b16eb36a325b37171fa6dd06ae7
parent3e6e6b4ec79f8cb3c9584798ffe1bf169183c0cd (diff)
Don't enable multilib-testing unless we want multilib enabled. (#974)
* Don't enable multilib-testing unless we want multilib enabled. * flake8 * Rename variable to make code more clear
-rw-r--r--archinstall/lib/installer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index e22883cb..c8ff612c 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -289,7 +289,7 @@ class Installer:
def post_install_check(self, *args :str, **kwargs :str) -> List[str]:
return [step for step, flag in self.helper_flags.items() if flag is False]
- def enable_testing_repositories(self):
+ def enable_testing_repositories(self, enable_multilib_testing=False):
# Set up a regular expression pattern of a commented line containing 'testing' within []
pattern = re.compile("^#\\[.*testing.*\\]$")
@@ -303,7 +303,7 @@ class Installer:
# Open the file again in write mode, to replace the contents
with open("/etc/pacman.conf", "w") as pacman_conf:
for line in lines:
- if pattern.match(line):
+ if pattern.match(line) and (enable_multilib_testing or 'multilib' not in line):
# If this is the [] block containing 'testing', uncomment it and set the matched tracking boolean.
pacman_conf.write(line.lstrip('#'))
matched = True