srbala/createhdds
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/createhdds.git synced 2024-11-25 08:13:07 +00:00
Code Issues Releases Activity

Handle i686 install tree location moving in F26

Browse Source
This commit is contained in:
Adam Williamson 2017-07-19 13:08:31 -07:00
parent e1254ba397
commit 2f55cbede3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
createhdds.py
View File

@ -228,20 +228,22 @@ class VirtInstallImage(object):
conn.close() conn.close()
tmpfile = "{0}.tmp".format(self.filename) tmpfile = "{0}.tmp".format(self.filename)
arch = self.arch
try: try:
# this is almost complex enough to need fedfind but not # this is almost complex enough to need fedfind but not
# quite, I think. also fedfind can't find the 'transient' # quite, I think. also fedfind can't find the 'transient'
# rawhide and branched locations at present # rawhide and branched locations at present
if self.release == 'rawhide': if self.release == 'rawhide':
loctmp = "https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/{1}/{2}/os" loctmp = "https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/{1}/{2}/os/"
elif int(self.release) > fedfind.helpers.get_current_release(branched=False): elif int(self.release) > fedfind.helpers.get_current_release(branched=False):
# branched # branched
loctmp = "https://dl.fedoraproject.org/pub/fedora/linux/development/" loctmp = "https://dl.fedoraproject.org/pub/fedora/linux/development/{0}/{1}/{2}/os/"
loctmp += str(self.release)
loctmp += "/{1}/{2}/os"
else: else:
loctmp = "https://download.fedoraproject.org/pub/fedora/linux/releases/{0}/{1}/{2}/os" if arch == 'i686' and int(self.release) > 25:
arch = self.arch # from F26 onwards, i686 is in fedora-secondary
loctmp = "https://download.fedoraproject.org/pub/fedora-secondary/linux/releases/{0}/{1}/{2}/os/"
else:
loctmp = "https://download.fedoraproject.org/pub/fedora/linux/releases/{0}/{1}/{2}/os/"
if arch == 'i686': if arch == 'i686':
arch = 'i386' arch = 'i386'
xargs = "inst.ks=file:/{0}.ks".format(self.name) xargs = "inst.ks=file:/{0}.ks".format(self.name)