From 8523b3c36313252ab3773b5f45a849fd547fe0f7 Mon Sep 17 00:00:00 2001 From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:36:53 +0530 Subject: [PATCH 1/4] Update Functions.py --- usr/share/blackbox/Functions.py | 37 +++++++++------------------------ 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/usr/share/blackbox/Functions.py b/usr/share/blackbox/Functions.py index c1beef6..6208fd5 100644 --- a/usr/share/blackbox/Functions.py +++ b/usr/share/blackbox/Functions.py @@ -44,45 +44,28 @@ blackbox_pidfile = "/tmp/blackbox.pid" # 10m timeout process_timeout = 600 -arcolinux_mirrorlist = "/etc/pacman.d/arcolinux-mirrorlist" +snigdhaos_mirrorlist = "/etc/pacman.d/snigdhaos-mirrorlist" pacman_conf = "/etc/pacman.conf" pacman_conf_backup = "/etc/pacman.conf.bak" pacman_logfile = "/var/log/pacman.log" pacman_lockfile = "/var/lib/pacman/db.lck" pacman_cache_dir = "/var/cache/pacman/pkg/" -arco_test_repo = [ - "#[arcolinux_repo_testing]", - "#SigLevel = PackageRequired DatabaseNever", - "#Include = /etc/pacman.d/arcolinux-mirrorlist", -] - -arco_repo = [ - "[arcolinux_repo]", +snigdhaos_core = [ + "[snigdhaos-core]", "SigLevel = PackageRequired DatabaseNever", - "Include = /etc/pacman.d/arcolinux-mirrorlist", -] - -arco_3rd_party_repo = [ - "[arcolinux_repo_3party]", + "Include = /etc/pacman.d/snigdhaos-mirrorlist", +]snigdhaos_extra = [ + "[snigdhaos-extra]", "SigLevel = PackageRequired DatabaseNever", - "Include = /etc/pacman.d/arcolinux-mirrorlist", + "Include = /etc/pacman.d/snigdhaos-mirrorlist", ] -arco_xlrepo = [ - "[arcolinux_repo_xlarge]", - "SigLevel = PackageRequired DatabaseNever", - "Include = /etc/pacman.d/arcolinux-mirrorlist", -] - - log_dir = "/var/log/blackbox/" config_dir = "%s/.config/blackbox" % home config_file = "%s/blackbox.yaml" % config_dir - event_log_file = "%s/event.log" % log_dir - export_dir = "%s/blackbox-exports" % home @@ -1789,7 +1772,7 @@ def remove_arco_keyring(): def install_arco_mirrorlist(): try: - mirrorlist = base_dir + "/packages/arcolinux-mirrorlist/" + mirrorlist = base_dir + "/packages/snigdhaos-mirrorlist/" file = os.listdir(mirrorlist) cmd_str = [ "pacman", @@ -1841,7 +1824,7 @@ def install_arco_mirrorlist(): def remove_arco_mirrorlist(): try: - cmd_str = ["pacman", "-Rdd", "arcolinux-mirrorlist-git", "--noconfirm"] + cmd_str = ["pacman", "-Rdd", "snigdhaos-mirrorlist-git", "--noconfirm"] logger.debug("%s" % " ".join(cmd_str)) with subprocess.Popen( cmd_str, @@ -2787,4 +2770,4 @@ def open_log_dir(): logger.error("Exception in open_log_dir(): %s" % e) -# ANYTHING UNDER THIS LINE IS CURRENTLY UNUSED! \ No newline at end of file +# ANYTHING UNDER THIS LINE IS CURRENTLY UNUSED! From 4a45962b60dbd12a46d4dcd3f7ef98c95744d360 Mon Sep 17 00:00:00 2001 From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:39:07 +0530 Subject: [PATCH 2/4] Update Functions.py --- usr/share/blackbox/Functions.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr/share/blackbox/Functions.py b/usr/share/blackbox/Functions.py index 6208fd5..ce7a81e 100644 --- a/usr/share/blackbox/Functions.py +++ b/usr/share/blackbox/Functions.py @@ -284,8 +284,8 @@ def sync_file_db(): def start_subprocess(self, cmd, progress_dialog, action, pkg, widget): try: self.switch_package_version.set_sensitive(False) - self.switch_arco_keyring.set_sensitive(False) - self.switch_arco_mirrorlist.set_sensitive(False) + self.switch_snigdhaos_keyring.set_sensitive(False) + self.switch_snigdhaos_mirrorlist.set_sensitive(False) widget.set_sensitive(False) @@ -385,8 +385,8 @@ def start_subprocess(self, cmd, progress_dialog, action, pkg, widget): if progress_dialog is not None: progress_dialog.btn_package_progress_close.set_sensitive(True) self.switch_package_version.set_sensitive(True) - self.switch_arco_keyring.set_sensitive(True) - self.switch_arco_mirrorlist.set_sensitive(True) + self.switch_snigdhaos_keyring.set_sensitive(True) + self.switch_snigdhaos_mirrorlist.set_sensitive(True) except SystemError as s: logger.error("SystemError in %s start_subprocess(): %s" % (action, s)) @@ -394,16 +394,16 @@ def start_subprocess(self, cmd, progress_dialog, action, pkg, widget): if progress_dialog is not None: progress_dialog.btn_package_progress_close.set_sensitive(True) self.switch_package_version.set_sensitive(True) - self.switch_arco_keyring.set_sensitive(True) - self.switch_arco_mirrorlist.set_sensitive(True) + self.switch_snigdhaos_keyring.set_sensitive(True) + self.switch_snigdhaos_mirrorlist.set_sensitive(True) # refresh ui components, once the process completes # show notification dialog to user if errors are encountered during package install/uninstall def refresh_ui(self, action, switch, pkg, progress_dialog, process_stdout_lst): self.switch_package_version.set_sensitive(True) - self.switch_arco_keyring.set_sensitive(True) - self.switch_arco_mirrorlist.set_sensitive(True) + self.switch_snigdhaos_keyring.set_sensitive(True) + self.switch_snigdhaos_mirrorlist.set_sensitive(True) logger.debug("Checking if package %s is installed" % pkg.name) installed = check_package_installed(pkg.name) From dfc5b95e688634c97f0c5e018bde08818a714331 Mon Sep 17 00:00:00 2001 From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:42:19 +0530 Subject: [PATCH 3/4] Update Functions.py --- usr/share/blackbox/Functions.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr/share/blackbox/Functions.py b/usr/share/blackbox/Functions.py index ce7a81e..3863ec8 100644 --- a/usr/share/blackbox/Functions.py +++ b/usr/share/blackbox/Functions.py @@ -1674,9 +1674,9 @@ def repo_exist(value): return False -def install_arco_keyring(): +def install_snigdhaos_keyring(): try: - keyring = base_dir + "/packages/arcolinux-keyring/" + keyring = base_dir + "/packages/snigdhaos-keyring/" file = os.listdir(keyring) cmd_str = [ "pacman", @@ -1706,7 +1706,7 @@ def install_arco_keyring(): else: if len(output) == 0: - output.append("Error: install of ArcoLinux keyring failed") + output.append("Error: install of Snigdha OS keyring failed") logger.error(" ".join(output)) @@ -1717,7 +1717,7 @@ def install_arco_keyring(): return result_err except Exception as e: - logger.error("Exception in install_arco_keyring(): %s" % e) + logger.error("Exception in install_snigdhaos_keyring(): %s" % e) result_err = {} result_err["cmd_str"] = cmd_str @@ -1726,9 +1726,9 @@ def install_arco_keyring(): return result_err -def remove_arco_keyring(): +def remove_snigdhaos_keyring(): try: - cmd_str = ["pacman", "-Rdd", "arcolinux-keyring", "--noconfirm"] + cmd_str = ["pacman", "-Rdd", "snigdhaos-keyring", "--noconfirm"] with subprocess.Popen( cmd_str, stdout=subprocess.PIPE, @@ -1760,7 +1760,7 @@ def remove_arco_keyring(): return result_err except Exception as e: - logger.error("Exception in remove_arco_keyring(): %s" % e) + logger.error("Exception in remove_snigdhaos_keyring(): %s" % e) result_err = {} From 5ca4e00674b6d752d5d8f9519a937e4f01f0ee38 Mon Sep 17 00:00:00 2001 From: "Abhiraj Roy (iconized)" <157954129+iconized@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:52:02 +0530 Subject: [PATCH 4/4] Update Functions.py --- usr/share/blackbox/Functions.py | 233 ++++++++++++++++---------------- 1 file changed, 114 insertions(+), 119 deletions(-) diff --git a/usr/share/blackbox/Functions.py b/usr/share/blackbox/Functions.py index 3863ec8..61c881b 100644 --- a/usr/share/blackbox/Functions.py +++ b/usr/share/blackbox/Functions.py @@ -1395,10 +1395,6 @@ def cache(package, path_dir_cache): exceptions = [ "florence", "mintstick-bin", - "arcolinux-conky-collection-plasma-git", - "arcolinux-desktop-trasher-git", - "arcolinux-pamac-all", - "arcolinux-sddm-simplicity-git", "ttf-hack", "ttf-roboto-mono", "aisleriot", @@ -1407,7 +1403,6 @@ def cache(package, path_dir_cache): "linux-rt-headers", "linux-rt-lts", "linux-rt-lts-headers", - "arcolinux-sddm-simplicity-git", "kodi-x11", "kodi-addons", "sardi-icons", @@ -1748,7 +1743,7 @@ def remove_snigdhaos_keyring(): else: if len(output) == 0: - output.append("Error: removal of ArcoLinux keyring failed") + output.append("Error: removal of Snigdha OS keyring failed") logger.error(" ".join(output)) @@ -1770,7 +1765,7 @@ def remove_snigdhaos_keyring(): return result_err -def install_arco_mirrorlist(): +def install_snigdhaos_mirrorlist(): try: mirrorlist = base_dir + "/packages/snigdhaos-mirrorlist/" file = os.listdir(mirrorlist) @@ -1801,7 +1796,7 @@ def install_arco_mirrorlist(): else: if len(output) == 0: - output.append("Error: install of ArcoLinux mirrorlist failed") + output.append("Error: install of Snigdha OS mirrorlist failed") logger.error(" ".join(output)) @@ -1812,7 +1807,7 @@ def install_arco_mirrorlist(): return result_err except Exception as e: - logger.error("Exception in install_arco_mirrorlist(): %s" % e) + logger.error("Exception in install_snigdhaos_mirrorlist(): %s" % e) result_err = {} @@ -1822,7 +1817,7 @@ def install_arco_mirrorlist(): return result_err -def remove_arco_mirrorlist(): +def remove_snigdhaos_mirrorlist(): try: cmd_str = ["pacman", "-Rdd", "snigdhaos-mirrorlist-git", "--noconfirm"] logger.debug("%s" % " ".join(cmd_str)) @@ -1845,7 +1840,7 @@ def remove_arco_mirrorlist(): else: if len(output) == 0: - output.append("Error: removal of ArcoLinux mirrorlist failed") + output.append("Error: removal of Snigdha OS mirrorlist failed") logger.error(" ".join(output)) @@ -1857,7 +1852,7 @@ def remove_arco_mirrorlist(): return result_err except Exception as e: - logger.error("Exception in remove_arco_mirrorlist(): %s" % e) + logger.error("Exception in remove_snigdhaos_mirrorlist(): %s" % e) result_err = {} @@ -1867,12 +1862,12 @@ def remove_arco_mirrorlist(): return result_err -def add_arco_repos(): - logger.info("Adding ArcoLinux repos on %s" % distr) +def add_snigdhaos_repos(): + logger.info("Adding Snigdha OS repos on %s" % distr) try: - # first check if arco repos are already inside pacman conf file + # first check if snigdhaos repos are already inside pacman conf file - if verify_arco_pacman_conf() is False: + if verify_snigdhaos_pacman_conf() is False: # take backup of existing pacman.conf file if os.path.exists(pacman_conf): @@ -1887,106 +1882,106 @@ def add_arco_repos(): with open(pacman_conf, "r", encoding="utf-8") as r: lines = r.readlines() - # check for existing ArcoLinux entries + # check for existing Snigdha OS entries if len(lines) > 0: - arco_test_repo_found = False - arco_repo_found = False - arco_3rd_party_repo_found = False - arco_xlrepo_found = False + snigdhaos_test_repo_found = False + snigdhaos_repo_found = False + snigdhaos_3rd_party_repo_found = False + snigdhaos_xlrepo_found = False for line in lines: if "#" in line.strip(): - if arco_test_repo[0].replace("#", "") in line.strip(): - arco_test_repo_found = True + if snigdhaos_test_repo[0].replace("#", "") in line.strip(): + snigdhaos_test_repo_found = True - if arco_repo[0].replace("#", "") in line.strip(): - arco_repo_found = True + if snigdhaos_repo[0].replace("#", "") in line.strip(): + snigdhaos_repo_found = True index = lines.index(line) del lines[index] - lines.insert(index, arco_repo[0]) + lines.insert(index, snigdhaos_repo[0]) index += 1 del lines[index] - lines.insert(index, arco_repo[1]) + lines.insert(index, snigdhaos_repo[1]) index += 1 del lines[index] - lines.insert(index, arco_repo[2]) + lines.insert(index, snigdhaos_repo[2]) - if arco_3rd_party_repo[0].replace("#", "") in line.strip(): - arco_3rd_party_repo_found = True + if snigdhaos_3rd_party_repo[0].replace("#", "") in line.strip(): + snigdhaos_3rd_party_repo_found = True index = lines.index(line) del lines[index] - lines.insert(index, arco_3rd_party_repo[0]) + lines.insert(index, snigdhaos_3rd_party_repo[0]) index += 1 del lines[index] - lines.insert(index, arco_3rd_party_repo[1]) + lines.insert(index, snigdhaos_3rd_party_repo[1]) index += 1 del lines[index] - lines.insert(index, arco_3rd_party_repo[2]) + lines.insert(index, snigdhaos_3rd_party_repo[2]) - if arco_xlrepo[0].replace("#", "") in line.strip(): - arco_xlrepo_found = True + if snigdhaos_xlrepo[0].replace("#", "") in line.strip(): + snigdhaos_xlrepo_found = True index = lines.index(line) del lines[index] - lines.insert(index, arco_xlrepo[0]) + lines.insert(index, snigdhaos_xlrepo[0]) index += 1 del lines[index] - lines.insert(index, arco_xlrepo[1]) + lines.insert(index, snigdhaos_xlrepo[1]) index += 1 del lines[index] - lines.insert(index, arco_xlrepo[2]) + lines.insert(index, snigdhaos_xlrepo[2]) - if line.strip() == arco_test_repo[0]: - arco_test_repo_found = True + if line.strip() == snigdhaos_test_repo[0]: + snigdhaos_test_repo_found = True - if line.strip() == arco_repo[0]: - arco_repo_found = True + if line.strip() == snigdhaos_repo[0]: + snigdhaos_repo_found = True - if line.strip() == arco_3rd_party_repo[0]: - arco_3rd_party_repo_found = True + if line.strip() == snigdhaos_3rd_party_repo[0]: + snigdhaos_3rd_party_repo_found = True - if line.strip() == arco_xlrepo[0]: - arco_xlrepo_found = True + if line.strip() == snigdhaos_xlrepo[0]: + snigdhaos_xlrepo_found = True - if arco_test_repo_found is False: + if snigdhaos_test_repo_found is False: lines.append("\n") - for arco_test_repo_line in arco_test_repo: - lines.append(arco_test_repo_line) + for snigdhaos_test_repo_line in snigdhaos_test_repo: + lines.append(snigdhaos_test_repo_line) - if arco_repo_found is False: + if snigdhaos_repo_found is False: lines.append("\n") - for arco_repo_line in arco_repo: - lines.append(arco_repo_line) + for snigdhaos_repo_line in snigdhaos_repo: + lines.append(snigdhaos_repo_line) - if arco_3rd_party_repo_found is False: + if snigdhaos_3rd_party_repo_found is False: lines.append("\n") - for arco_3rd_party_repo_line in arco_3rd_party_repo: - lines.append(arco_3rd_party_repo_line) + for snigdhaos_3rd_party_repo_line in snigdhaos_3rd_party_repo: + lines.append(snigdhaos_3rd_party_repo_line) - if arco_xlrepo_found is False: + if snigdhaos_xlrepo_found is False: lines.append("\n") - for arco_xlrepo_line in arco_xlrepo: - lines.append(arco_xlrepo_line) + for snigdhaos_xlrepo_line in snigdhaos_xlrepo: + lines.append(snigdhaos_xlrepo_line) - logger.info("[Add ArcoLinux repos] Writing to %s" % pacman_conf) + logger.info("[Add Snigdha OS repos] Writing to %s" % pacman_conf) if len(lines) > 0: with open(pacman_conf, "w", encoding="utf-8") as w: @@ -2003,19 +1998,19 @@ def add_arco_repos(): else: logger.error("Failed to read %s" % pacman_conf) else: - logger.info("ArcoLinux repos already setup inside pacman conf file") + logger.info("Snigdha OS repos already setup inside pacman conf file") return 0 except Exception as e: - logger.error("Exception in add_arco_repos(): %s" % e) + logger.error("Exception in add_snigdhaos_repos(): %s" % e) return e -def remove_arco_repos(): - # remove the ArcoLinux repos in /etc/pacman.conf +def remove_snigdhaos_repos(): + # remove the Snigdha OS repos in /etc/pacman.conf try: - # check for existing ArcoLinux entries and remove - if verify_arco_pacman_conf() is True: + # check for existing Snigdha OS entries and remove + if verify_snigdhaos_pacman_conf() is True: if os.path.exists(pacman_conf): shutil.copy(pacman_conf, pacman_conf_backup) @@ -2030,48 +2025,48 @@ def remove_arco_repos(): index = 0 for line in lines: - if arco_test_repo[0] == line.strip().replace(" ", ""): + if snigdhaos_test_repo[0] == line.strip().replace(" ", ""): index = lines.index(line) if index > 0: - if distr != "arcolinux": + if distr != "snigdhaos": del lines[index] del lines[index] del lines[index] - # make sure the arco testing repo is disabled, if absolutely required update the pacman conf file manually and enable them + # make sure the snigdhaos testing repo is disabled, if absolutely required update the pacman conf file manually and enable them - if "%s" % arco_test_repo[0].replace("#", "") == line.strip(): + if "%s" % snigdhaos_test_repo[0].replace("#", "") == line.strip(): index = lines.index( - "%s\n" % arco_test_repo[0].replace("#", "") + "%s\n" % snigdhaos_test_repo[0].replace("#", "") ) - if distr != "arcolinux": + if distr != "snigdhaos": del lines[index] del lines[index] del lines[index] else: # comment out the testing repo - lines[index] = "%s\n" % arco_test_repo[0] - lines[index + 1] = "%s\n" % arco_test_repo[1] - lines[index + 2] = "%s\n" % arco_test_repo[2] + lines[index] = "%s\n" % snigdhaos_test_repo[0] + lines[index + 1] = "%s\n" % snigdhaos_test_repo[1] + lines[index + 2] = "%s\n" % snigdhaos_test_repo[2] - if "%s\n" % arco_repo[0] == line: - index = lines.index("%s\n" % arco_repo[0]) + if "%s\n" % snigdhaos_repo[0] == line: + index = lines.index("%s\n" % snigdhaos_repo[0]) if index > 0: - if distr != "arcolinux": + if distr != "snigdhaos": del lines[index] del lines[index] del lines[index] else: - lines[index] = "#%s\n" % arco_repo[0] - lines[index + 1] = "#%s\n" % arco_repo[1] - lines[index + 2] = "#%s\n" % arco_repo[2] + lines[index] = "#%s\n" % snigdhaos_repo[0] + lines[index + 1] = "#%s\n" % snigdhaos_repo[1] + lines[index + 2] = "#%s\n" % snigdhaos_repo[2] elif ( "#" in line.strip() - and arco_repo[0] == line.replace("#", "").strip() - and distr != "arcolinux" + and snigdhaos_repo[0] == line.replace("#", "").strip() + and distr != "snigdhaos" ): # check if already commented @@ -2080,22 +2075,22 @@ def remove_arco_repos(): del lines[index] del lines[index] - if "%s\n" % arco_3rd_party_repo[0] == line: - index = lines.index("%s\n" % arco_3rd_party_repo[0]) + if "%s\n" % snigdhaos_3rd_party_repo[0] == line: + index = lines.index("%s\n" % snigdhaos_3rd_party_repo[0]) if index > 0: - if distr != "arcolinux": + if distr != "snigdhaos": del lines[index] del lines[index] del lines[index] else: - lines[index] = "#%s\n" % arco_3rd_party_repo[0] - lines[index + 1] = "#%s\n" % arco_3rd_party_repo[1] - lines[index + 2] = "#%s\n" % arco_3rd_party_repo[2] + lines[index] = "#%s\n" % snigdhaos_3rd_party_repo[0] + lines[index + 1] = "#%s\n" % snigdhaos_3rd_party_repo[1] + lines[index + 2] = "#%s\n" % snigdhaos_3rd_party_repo[2] elif ( "#" in line.strip() - and arco_3rd_party_repo[0] == line.replace("#", "").strip() - and distr != "arcolinux" + and snigdhaos_3rd_party_repo[0] == line.replace("#", "").strip() + and distr != "snigdhaos" ): # check if already commented @@ -2104,22 +2099,22 @@ def remove_arco_repos(): del lines[index] del lines[index] - if "%s\n" % arco_xlrepo[0] == line: - index = lines.index("%s\n" % arco_xlrepo[0]) + if "%s\n" % snigdhaos_xlrepo[0] == line: + index = lines.index("%s\n" % snigdhaos_xlrepo[0]) if index > 0: - if distr != "arcolinux": + if distr != "snigdhaos": del lines[index] del lines[index] del lines[index] else: - lines[index] = "#%s\n" % arco_xlrepo[0] - lines[index + 1] = "#%s\n" % arco_xlrepo[1] - lines[index + 2] = "#%s\n" % arco_xlrepo[2] + lines[index] = "#%s\n" % snigdhaos_xlrepo[0] + lines[index + 1] = "#%s\n" % snigdhaos_xlrepo[1] + lines[index + 2] = "#%s\n" % snigdhaos_xlrepo[2] elif ( "#" in line.strip() - and arco_xlrepo[0] == line.replace("#", "").strip() - and distr != "arcolinux" + and snigdhaos_xlrepo[0] == line.replace("#", "").strip() + and distr != "snigdhaos" ): # check if already commented @@ -2128,10 +2123,10 @@ def remove_arco_repos(): del lines[index] del lines[index] - # remove any white spaces from end of the file only if on non arcolinux system - # on any non arcolinux distro lines are deleted which leaves empty lines in the file + # remove any white spaces from end of the file only if on non snigdhaos system + # on any non snigdhaos distro lines are deleted which leaves empty lines in the file # causing the file to grow in size - if distr != "arcolinux": + if distr != "snigdhaos": if lines[-1] == "\n": del lines[-1] @@ -2144,7 +2139,7 @@ def remove_arco_repos(): if lines[-4] == "\n": del lines[-4] - logger.info("[Remove ArcoLinux Repos] Writing to %s" % pacman_conf) + logger.info("[Remove Snigdha OS Repos] Writing to %s" % pacman_conf) if len(lines) > 0: with open(pacman_conf, "w") as w: @@ -2160,56 +2155,56 @@ def remove_arco_repos(): else: logger.error("Failed to read %s" % pacman_conf) else: - logger.info("No ArcoLinux repos setup inside pacman conf file") + logger.info("No Snigdha OS repos setup inside pacman conf file") return 0 except Exception as e: - logger.error("Exception in remove_arco_repos(): %s" % e) + logger.error("Exception in remove_snigdhaos_repos(): %s" % e) return e -# check if pacman.conf has arco repos setup +# check if pacman.conf has snigdhaos repos setup -def verify_arco_pacman_conf(): +def verify_snigdhaos_pacman_conf(): try: lines = None - arco_repo_setup = False - arco_3rd_party_repo_setup = False - arco_xlrepo_setup = False + snigdhaos_repo_setup = False + snigdhaos_3rd_party_repo_setup = False + snigdhaos_xlrepo_setup = False with open(pacman_conf, "r") as r: lines = r.readlines() if lines is not None: for line in lines: - if arco_repo[0] in line.strip(): + if snigdhaos_repo[0] in line.strip(): if "#" not in line.strip(): - arco_repo_setup = True + snigdhaos_repo_setup = True else: return False - if arco_3rd_party_repo[0] in line.strip(): + if snigdhaos_3rd_party_repo[0] in line.strip(): if "#" not in line.strip(): - arco_3rd_party_repo_setup = True + snigdhaos_3rd_party_repo_setup = True else: return False - if arco_xlrepo[0] in line.strip(): + if snigdhaos_xlrepo[0] in line.strip(): if "#" not in line.strip(): - arco_xlrepo_setup = True + snigdhaos_xlrepo_setup = True else: return False if ( - arco_repo_setup is True - and arco_3rd_party_repo_setup is True - and arco_xlrepo_setup is True + snigdhaos_repo_setup is True + and snigdhaos_3rd_party_repo_setup is True + and snigdhaos_xlrepo_setup is True ): return True else: return False except Exception as e: - logger.error("Exception in check_arco_pacman(): %s" % e) + logger.error("Exception in check_snigdhaos_pacman(): %s" % e) # =====================================================