Updated for repos names

This commit is contained in:
Dimitris Zlatanidis 2023-04-01 11:11:34 +03:00
parent d25ba99f3f
commit 98388f5d03
2 changed files with 10 additions and 21 deletions

View file

@ -288,7 +288,7 @@ class Argparse(Configs):
if self.binary_repo == '*' and not self.utils.is_option(except_options, self.args):
self.usage.help_minimal(f"{self.prog_name}: invalid binary repository '{self.binary_repo}'")
elif self.binary_repo not in self.repos.binaries_repositories_dict.keys() and self.binary_repo != '*':
elif self.binary_repo not in self.repos.bin_repos_names and self.binary_repo != '*':
self.usage.help_minimal(f"{self.prog_name}: invalid binary repository '{self.binary_repo}'")
def invalid_options(self) -> None:

View file

@ -246,26 +246,6 @@ class Repositories:
f"'mv {repositories_file_toml}.new {repositories_file_toml}'.\n"
f"or '{cyan}slpkg_new-configs{endc}' command.\n")
# Dictionary with the binaries repositories.
binaries_repositories_dict = {
alien_repo_name: alien_repo,
multilib_repo_name: multilib_repo,
restricted_repo_name: restricted_repo,
gnome_repo_name: gnome_repo,
conraid_repo_name: conraid_repo,
slackonly_repo_name: slackonly_repo,
ponce_bin_repo_name: ponce_bin_repo,
salixos_repo_name: salixos_repo,
salixos_extra_repo_name: salixos_extra_repo,
slackel_repo_name: slackel_repo,
slint_repo_name: slint_repo
}
# All enabled binaries repositories.
for repo, enable in binaries_repositories_dict.items():
if enable:
bin_enabled_repos.append(repo)
if ponce_repo:
sbo_enabled_repository: str = ponce_repo_name
repo_tag: str = ponce_repo_tag
@ -287,3 +267,12 @@ class Repositories:
slackel_repo_name: [slackel_repo, slackel_repo_path, slackel_repo_changelog],
slint_repo_name: [slint_repo, slint_repo_path, slint_repo_changelog]
}
# All the binary repositories names.
bin_repos_names = list(repos_dict.keys())[2:]
# All the enabled binary repositories.
for repo, enabled in repos_dict.items():
if repo not in [sbo_repo_name, ponce_repo_name]:
if enabled[0]:
bin_enabled_repos.append(repo)