openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

urlfetcher: Make debian treearch checking more generic 

Use regex parsing rather than a whitelist
This commit is contained in:
Cole Robinson 2015-03-27 13:06:26 -04:00
parent 0dc334fa58
commit 82e9684fa6
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_urls.py
View File

@ -157,6 +157,8 @@ _add(DEBIAN_URL % ("squeeze", "amd64"), "debian6")
_add(DEBIAN_URL % ("wheezy", "amd64"), "debian7") _add(DEBIAN_URL % ("wheezy", "amd64"), "debian7")
# And daily builds, since we specially handle that URL # And daily builds, since we specially handle that URL
_add(DAILY_DEBIAN_URL % ("amd64"), "debian7", name="debiandaily") _add(DAILY_DEBIAN_URL % ("amd64"), "debian7", name="debiandaily")
_add(DAILY_DEBIAN_URL % ("arm64"), "debian7",
name="debiandailyarm64", hasxen=False)
_set_distro(UbuntuDistro) _set_distro(UbuntuDistro)

66
virtinst/urlfetcher.py
View File

@ -884,49 +884,49 @@ class DebianDistro(Distro):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
Distro.__init__(self, *args, **kwargs) Distro.__init__(self, *args, **kwargs)
if self.uri.count("i386"):
self._treeArch = "i386"
elif self.uri.count("amd64"):
self._treeArch = "amd64"
elif self.uri.count("ppc64el"):
self._treeArch = "ppc64el"
else:
self._treeArch = "i386"
if re.match(r'i[4-9]86', self.arch): # Pull the tree's arch out of the URL text
self.arch = 'i386' self._treeArch = "i386"
for pattern in ["^.*/installer-(\w+)/?$",
"^.*/daily-images/(\w+)/?$"]:
arch = re.findall(pattern, self.uri)
if arch:
self._treeArch = arch[0]
break
self._installer_name = self.name.lower() + "-" + "installer" self._url_prefix = 'current/images'
self._prefix = 'current/images' self._installer_dirname = self.name.lower() + "-installer"
self._set_media_paths() self._set_media_paths()
def _set_media_paths(self): def _set_media_paths(self):
# Use self._prefix to set media paths self._boot_iso_paths = ["%s/netboot/mini.iso" % self._url_prefix]
self._boot_iso_paths = ["%s/netboot/mini.iso" % self._prefix]
hvmroot = "%s/netboot/%s/%s/" % (self._prefix, hvmroot = "%s/netboot/%s/%s/" % (self._url_prefix,
self._installer_name, self._installer_dirname,
self._treeArch) self._treeArch)
xenroot = "%s/netboot/xen/" % self._prefix initrd_basename = "initrd.gz"
if self._treeArch == "ppc64el": kernel_basename = "linux"
self._hvm_kernel_paths = [(hvmroot + "vmlinux", hvmroot + "initrd.gz")] if self._treeArch in ["ppc64el"]:
else: kernel_basename = "vmlinux"
self._hvm_kernel_paths = [(hvmroot + "linux", hvmroot + "initrd.gz")] self._hvm_kernel_paths = [
self._xen_kernel_paths = [(xenroot + "vmlinuz", (hvmroot + kernel_basename, hvmroot + initrd_basename)]
xenroot + "initrd.gz")]
xenroot = "%s/netboot/xen/" % self._url_prefix
self._xen_kernel_paths = [(xenroot + "vmlinuz", xenroot + "initrd.gz")]
def isValidStore(self): def isValidStore(self):
if self.fetcher.hasFile("%s/MANIFEST" % self._prefix): if self.fetcher.hasFile("%s/MANIFEST" % self._url_prefix):
# For regular trees # For regular trees
pass pass
elif self.fetcher.hasFile("daily/MANIFEST"): elif self.fetcher.hasFile("daily/MANIFEST"):
# For daily trees # For daily trees
self._prefix = "daily" self._url_prefix = "daily"
self._set_media_paths() self._set_media_paths()
else: else:
return False return False
filename = "%s/MANIFEST" % self._prefix filename = "%s/MANIFEST" % self._url_prefix
regex = ".*%s.*" % self._installer_name regex = ".*%s.*" % self._installer_dirname
if not self._fetchAndMatchRegex(filename, regex): if not self._fetchAndMatchRegex(filename, regex):
logging.debug("Regex didn't match, not a %s distro", self.name) logging.debug("Regex didn't match, not a %s distro", self.name)
return False return False
@ -943,7 +943,7 @@ class DebianDistro(Distro):
root = self.name.lower() root = self.name.lower()
oses = [n for n in osdict.list_os() if n.name.startswith(root)] oses = [n for n in osdict.list_os() if n.name.startswith(root)]
if self._prefix == "daily": if self._url_prefix == "daily":
return oses[0].name return oses[0].name
for osobj in oses: for osobj in oses:
@ -963,15 +963,15 @@ class UbuntuDistro(DebianDistro):
urldistro = "ubuntu" urldistro = "ubuntu"
def isValidStore(self): def isValidStore(self):
if self.fetcher.hasFile("%s/MANIFEST" % self._prefix): if self.fetcher.hasFile("%s/MANIFEST" % self._url_prefix):
# For regular trees # For regular trees
filename = "%s/MANIFEST" % self._prefix filename = "%s/MANIFEST" % self._url_prefix
regex = ".*%s.*" % self._installer_name regex = ".*%s.*" % self._installer_dirname
elif self.fetcher.hasFile("install/netboot/version.info"): elif self.fetcher.hasFile("install/netboot/version.info"):
# For trees based on ISO's # For trees based on ISO's
self._prefix = "install" self._url_prefix = "install"
self._set_media_paths() self._set_media_paths()
filename = "%s/netboot/version.info" % self._prefix filename = "%s/netboot/version.info" % self._url_prefix
regex = "%s*" % self.name regex = "%s*" % self.name
else: else:
return False return False