Skip to content

Set mirrorlist instead of baseurl in .repo files & accept both when reading #203

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

Draft
aylen384 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Set mirrorlist instead of baseurl in .repo files & accept both when reading #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion opi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,11 @@ def get_repos():
for alias in cp.sections():
if not bool(int(cp.get(alias, 'enabled'))):
continue
url = cp[alias].get('baseurl')
if not url:
url = cp[alias].get('mirrorlist')
if url:
url = re.sub(r"\?mirrorlist$", "", url)
repo = {
'alias': alias,
'filename': re.sub(r'\.repo$', '', repo_file),
Expand All @@ -293,7 +298,14 @@ def add_repo(filename, name, url, enabled=True, gpgcheck=True, gpgkey=None, repo
tf = tempfile.NamedTemporaryFile('w')
tf.file.write(f'[{filename}]\n')
tf.file.write(f'name={name}\n')
tf.file.write(f'baseurl={url}\n')
if url.startswith('https://download.opensuse.org') or url.startswith('https://cdn.opensuse.org'):
# These servers support the /?mirrorlist suffix
# see https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/JR725AXWDZYLJ3PKIKYAYQQAXE6OWQMM/
if not url.endswith('/'):
url = f"{url}/"
tf.file.write(f'mirrorlist={url}?mirrorlist\n')
else:
tf.file.write(f'baseurl={url}\n')
tf.file.write(f'enabled={enabled:d}\n')
tf.file.write(f'type={repo_type}\n')
tf.file.write(f'gpgcheck={gpgcheck:d}\n')
Expand Down
Loading