Skip to content
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

Jump to bottom

modular changes for Fedora 28 #237

Closed
wants to merge 1 commit into from
Closed

modular changes for Fedora 28 #237

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 42 additions & 28 deletions mirrormanager2/lib/repomap.py
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@ def repo_prefix(path, category, ver):
# assign shortnames to repositories like yum default mirrorlists expects
isDebug = u'debug' in path
isRawhide = u'rawhide' in path
isBikeshed = u'bikeshed' in path
isDevelopment = is_development(path) is not None
isSource = u'source' in path or u'SRPMS' in path
isUpdatesTesting = u'updates/testing' in path
Expand All @@ -40,7 +39,7 @@ def repo_prefix(path, category, ver):
isEverything = u'Everything' in path
isFedora = u'Fedora' in path
isServer = u'Server' in path
isModular = u'modular' in path
isModular = u'Modular' in path


isEpel = (category.name == u'Fedora EPEL')
Expand Down Expand Up @@ -80,8 +79,8 @@ def repo_prefix(path, category, ver):
prefix = u'epel-%s' % version

elif isFedoraLinux or isFedoraSecondary or isFedoraArchive:
if isReleases or isDevelopment or isModular:
if isEverything and not isModular:
if isReleases or isDevelopment:
if isEverything:
if isRawhide:
# rawhide
if isDebug:
Expand All @@ -97,47 +96,62 @@ def repo_prefix(path, category, ver):
prefix = u'fedora-source-%s' % version
else:
prefix=u'fedora-%s' % version
elif isFedora and not isModular:
elif isFedora:
if isDebug or isSource:
# ignore releases/$version/Fedora/$arch/debug/
# ignore releases/$version/Fedora/source/SRPMS/
prefix = None
else:
# fedora-install-
prefix = u'fedora-install-%s' % version
elif isModular and isServer:
if isBikeshed:
# Modular Bikeshed
elif isModular:
if isUpdatesReleased:
# updates-released-modular-
if isDebug:
prefix = u'modular-bikeshed-server-debug'
prefix = u'updates-released-modular-debug-f%s' % version
elif isSource:
prefix = u'modular-bikeshed-server-source'
prefix = u'updates-released-modular-source-f%s' % version
else:
prefix = u'modular-bikeshed-server'
elif isUpdatesReleased:
# Modular Server updates-released-
if isDebug:
prefix = u'modular-server-updates-released-debug-f%s' % version
elif isSource:
prefix = u'modular-server-updates-released-source-f%s' % version
else:
prefix = u'modular-server-updates-released-f%s' % version
prefix = u'updates-released-modular-f%s' % version
elif isUpdatesTesting:
# Modular Server updates-testing
# updates-testing-modular-
if isDebug:
prefix = u'modular-server-updates-testing-debug-f%s' % version
prefix = u'updates-testing-modular-debug-f%s' % version
elif isSource:
prefix = u'modular-server-updates-testing-source-f%s' % version
prefix = u'updates-testing-modular-source-f%s' % version
else:
prefix = u'modular-server-updates-testing-f%s' % version
else:
#Modular Releases
prefix = u'updates-testing-modular-f%s' % version
elif isRawhide:
# rawhide-modular
if isDebug:
prefix = u'modular-fedora-server-debug-f%s' % version
prefix = u'rawhide-modular-debug'
elif isSource:
prefix = u'modular-fedora-server-source-f%s' % version
prefix = u'rawhide-modular-source'
else:
prefix = u'modular-fedora-server-f%s' % version
prefix = u'rawhide-modular'
# fedora-modular-
elif isDebug:
prefix = u'fedora-modular-debug-%s' % version
elif isSource:
prefix = u'fedora-modular-source-%s' % version
else:
prefix=u'fedora-modular-%s' % version
elif isUpdatesReleased:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This entire portion is for the use case when we have a Everything tree inside of updates and updates-testing which we will have next to Modular for updates and updates-testing

# updates-released-
if isDebug:
prefix = u'updates-released-debug-f%s' % version
elif isSource:
prefix = u'updates-released-source-f%s' % version
else:
prefix = u'updates-released-f%s' % version
elif isUpdatesTesting:
# updates-testing-
if isDebug:
prefix = u'updates-testing-debug-f%s' % version
elif isSource:
prefix = u'updates-testing-source-f%s' % version
else:
prefix = u'updates-testing-f%s' % version

elif isAtomic:
# atomic
Expand Down