Skip to content

getPrepSequence robustness #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ydirson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

getPrepSequence robustness #240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f284485
backend: split determineRepositories out of performInstallation
ydirson Mar 28, 2025
deccfa3
backend: call determineRepositories() before getPrepSequence()
ydirson Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 45 additions & 43 deletions backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,42 @@ def progressCallback(x):
doCleanup(answers['cleanup'])
del answers['cleanup']

def determineRepositories(answers, answers_pristine, main_repositories, update_repositories):
def add_repos(main_repositories, update_repositories, repos):
"""Add repositories to the appropriate list, ensuring no duplicates,
that the main repository is at the beginning, and that the order of the
rest is maintained."""

for repo in repos:
if isinstance(repo, repository.UpdateYumRepository):
repo_list = update_repositories
else:
repo_list = main_repositories

if repo not in repo_list:
if repo.identifier() == MAIN_REPOSITORY_NAME:
repo_list.insert(0, repo)
else:
repo_list.append(repo)

# A list of sources coming from the answerfile
if 'sources' in answers_pristine:
for i in answers_pristine['sources']:
repos = repository.repositoriesFromDefinition(i['media'], i['address'])
add_repos(main_repositories, update_repositories, repos)

# A single source coming from an interactive install
if 'source-media' in answers_pristine and 'source-address' in answers_pristine:
repos = repository.repositoriesFromDefinition(answers_pristine['source-media'], answers_pristine['source-address'])
add_repos(main_repositories, update_repositories, repos)

for media, address in answers_pristine['extra-repos']:
repos = repository.repositoriesFromDefinition(media, address)
add_repos(main_repositories, update_repositories, repos)

if not main_repositories or main_repositories[0].identifier() != MAIN_REPOSITORY_NAME:
raise RuntimeError("No main repository found")

def performInstallation(answers, ui_package, interactive):
logger.log("INPUT ANSWERS DICTIONARY:")
prettyLogAnswers(answers)
Expand Down Expand Up @@ -352,9 +388,17 @@ def performInstallation(answers, ui_package, interactive):
assert answers['net-admin-interface'].startswith("eth")
answers['net-admin-bridge'] = "xenbr%s" % answers['net-admin-interface'][3:]

# A list needs to be used rather than a set since the order of updates is
# important. However, since the same repository might exist in multiple
# locations or the same location might be listed multiple times, care is
# needed to ensure that there are no duplicates.
main_repositories = []
update_repositories = []
answers_pristine = answers.copy()

@GeraldEV GeraldEV Sep 19, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need answers_pristine? At this point it is identical to answers and determineRepositories doesn't edit them (simply queries the contents and updates the lists by argument)
Seems like a good opportunity to simplify the extracted method

determineRepositories(answers, answers_pristine, main_repositories, update_repositories)

# perform installation:
prep_seq = getPrepSequence(answers, interactive)
answers_pristine = answers.copy()
executeSequence(prep_seq, "Preparing for installation...", answers, ui_package, False)

# install from main repositories:
Expand All @@ -368,48 +412,6 @@ def handleRepos(repos, ans):

answers['installed-repos'] = {}

# A list needs to be used rather than a set since the order of updates is
# important. However, since the same repository might exist in multiple
# locations or the same location might be listed multiple times, care is
# needed to ensure that there are no duplicates.
main_repositories = []
update_repositories = []

def add_repos(main_repositories, update_repositories, repos):
"""Add repositories to the appropriate list, ensuring no duplicates,
that the main repository is at the beginning, and that the order of the
rest is maintained."""

for repo in repos:
if isinstance(repo, repository.UpdateYumRepository):
repo_list = update_repositories
else:
repo_list = main_repositories

if repo not in repo_list:
if repo.identifier() == MAIN_REPOSITORY_NAME:
repo_list.insert(0, repo)
else:
repo_list.append(repo)

# A list of sources coming from the answerfile
if 'sources' in answers_pristine:
for i in answers_pristine['sources']:
repos = repository.repositoriesFromDefinition(i['media'], i['address'])
add_repos(main_repositories, update_repositories, repos)

# A single source coming from an interactive install
if 'source-media' in answers_pristine and 'source-address' in answers_pristine:
repos = repository.repositoriesFromDefinition(answers_pristine['source-media'], answers_pristine['source-address'])
add_repos(main_repositories, update_repositories, repos)

for media, address in answers_pristine['extra-repos']:
repos = repository.repositoriesFromDefinition(media, address)
add_repos(main_repositories, update_repositories, repos)

if not main_repositories or main_repositories[0].identifier() != MAIN_REPOSITORY_NAME:
raise RuntimeError("No main repository found")

handleMainRepos(main_repositories, answers)
if update_repositories:
handleRepos(update_repositories, answers)
Expand Down