38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
Subject: urldetect: Check also for 'treeinfo' (bz 1689252)
|
||
|
|
From: Cole Robinson crobinso@redhat.com Mon Mar 18 14:22:25 2019 -0400
|
||
|
|
Date: Mon Mar 18 14:24:07 2019 -0400:
|
||
|
|
Git: 74bbc3db15d5e9a1b4d21c276f7d3f435b83d2fd
|
||
|
|
|
||
|
|
Trees published to akamai CDN via Red Hat Satellite can't have .dotfiles
|
||
|
|
in them. More details here:
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=635065
|
||
|
|
|
||
|
|
So we also need to check for .treeinfo. Anaconda does this too so it's
|
||
|
|
a long known issue.
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1689252
|
||
|
|
|
||
|
|
diff --git a/virtinst/urldetect.py b/virtinst/urldetect.py
|
||
|
|
index 3033e6ea..4d301ef3 100644
|
||
|
|
--- a/virtinst/urldetect.py
|
||
|
|
+++ b/virtinst/urldetect.py
|
||
|
|
@@ -48,7 +48,16 @@ class _DistroCache(object):
|
||
|
|
if self._treeinfo:
|
||
|
|
return self._treeinfo
|
||
|
|
|
||
|
|
- treeinfostr = self.acquire_file_content(".treeinfo")
|
||
|
|
+ # Vast majority of trees here use .treeinfo. However, trees via
|
||
|
|
+ # Red Hat satellite on akamai CDN will use treeinfo, because akamai
|
||
|
|
+ # doesn't do dotfiles apparently:
|
||
|
|
+ #
|
||
|
|
+ # https://bugzilla.redhat.com/show_bug.cgi?id=635065
|
||
|
|
+ #
|
||
|
|
+ # Anaconda is the canonical treeinfo consumer and they check for both
|
||
|
|
+ # locations, so we need to do the same
|
||
|
|
+ treeinfostr = (self.acquire_file_content(".treeinfo") or
|
||
|
|
+ self.acquire_file_content("treeinfo"))
|
||
|
|
if treeinfostr is None:
|
||
|
|
return None
|
||
|
|
|