urlfetcher: More debugging around urldistro prioritizing

Plus we can always depend on guest.os_variant, so drop the check
This commit is contained in:
Cole Robinson 2017-05-11 16:28:42 -04:00
parent 86e2c23d71
commit 87b37f3049
1 changed files with 13 additions and 7 deletions

View File

@ -478,10 +478,7 @@ def getDistroStore(guest, fetcher):
arch = guest.os.arch
_type = guest.os.os_type
urldistro = None
if guest.os_variant:
urldistro = OSDB.lookup_os(guest.os_variant).urldistro
urldistro = OSDB.lookup_os(guest.os_variant).urldistro
treeinfo = _grabTreeinfo(fetcher)
if not treeinfo:
@ -494,13 +491,22 @@ def getDistroStore(guest, fetcher):
# If user manually specified an os_distro, bump it's URL class
# to the top of the list
if urldistro:
logging.debug("variant=%s has distro=%s, looking for matching "
"distro store to prioritize",
guest.os_variant, urldistro)
found = False
for store in stores:
if store.urldistro == urldistro:
logging.debug("Prioritizing distro store=%s", store)
stores.remove(store)
stores.insert(0, store)
found = True
break
if found:
logging.debug("Prioritizing distro store=%s", store)
stores.remove(store)
stores.insert(0, store)
else:
logging.debug("No matching store found, not prioritizing anything")
if treeinfo:
stores.sort(key=lambda x: not x.uses_treeinfo)