From 7a163d87a8ba4952617f47767bab857c3535e774 Mon Sep 17 00:00:00 2001 From: karasu Date: Sun, 9 Sep 2018 18:59:13 +0200 Subject: [PATCH] Workaround for bug in antergos-iso (multilib is not enabled) --- README.md | 2 +- src/cnchi.py | 24 ++++++++++++++++++++++++ src/info.py | 2 +- update.info | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3494125ac..0f55e366f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ You are viewing the `0.15.x` branch (development). |Development Stage|Branch|Version| Code Status| ----------------- | -------------- | -------------- | -------- | |Cnchi Stable|0.14.x|![0.14.473](https://img.shields.io/github/release/antergos/cnchi.svg)|Frozen| -|Cnchi Development|0.15.x|![0.15.347](https://img.shields.io/github/release/antergos/cnchi/all.svg)|Development| +|Cnchi Development|0.15.x|![0.15.348](https://img.shields.io/github/release/antergos/cnchi/all.svg)|Development| |Cnchi Next (UI agnostic)|master|0.17.x|Development| ## Usage: diff --git a/src/cnchi.py b/src/cnchi.py index 452927b76..c91313bd8 100644 --- a/src/cnchi.py +++ b/src/cnchi.py @@ -233,6 +233,9 @@ def __init__(self): if not self.check_iso_version(): sys.exit(1) + # Enables multilib repo only if it's not enabled + self.enable_multilib() + # Disable suspend to RAM self.disable_suspend() @@ -516,6 +519,27 @@ def check_for_files(): return True + @staticmethod + def enable_multilib(): + """ Enable multilib repo in /etc/pacman.conf """ + + # Check if it is enabled + with open("/etc/pacman.conf", 'rt') as pconf: + lines = pconf.readlines() + + enabled = False + for line in lines: + if line.startswith("[multilib]"): + enabled = True + break + + if not enabled: + logging.debug("Adding multilib repository to /etc/pacman.conf") + with misc.raised_privileges(): + with open("/etc/pacman.conf", 'at') as pconf: + pconf.write("[multilib]\n") + pconf.write("Include = /etc/pacman.d/mirrorlist\n\n") + def disable_suspend(self): """ Disable gnome settings suspend to ram """ try: diff --git a/src/info.py b/src/info.py index bec074ce5..ccbd44dab 100755 --- a/src/info.py +++ b/src/info.py @@ -29,7 +29,7 @@ """ Set some Cnchi global constants """ -CNCHI_VERSION = "0.15.347" +CNCHI_VERSION = "0.15.348" """ Cnchi version """ CNCHI_WEBSITE = "http://www.antergos.com" diff --git a/update.info b/update.info index 4c447c36b..b5492587a 100644 --- a/update.info +++ b/update.info @@ -1,2 +1,2 @@ -{"version":"0.15.347","files":[ +{"version":"0.15.348","files":[ ]}