On Mon, 2012-05-21 at 09:16 +0200, Zdeněk Pavlas wrote:
> - Do not profile absolute file:// URLs.
> - Give a hint to _TH.update() which baseurl was used
> so we may profile file:// mirrors, too.
> - Strip username and password from stored hostnames.
> ---
> urlgrabber/grabber.py | 20 ++++++++++++++------
> 1 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
> index 094be77..be85f92 100644
> --- a/urlgrabber/grabber.py
> +++ b/urlgrabber/grabber.py
> @@ -2060,7 +2060,7 @@ class _ExternalDownloader:
> else:
> ug_err = URLGrabError(int(line[4]), line[5])
> if DEBUG: DEBUG.info('failure: %s', err)
> - _TH.update(opts.url, int(line[2]), float(line[3]), ug_err)
> + _TH.update(opts.url, int(line[2]), float(line[3]), ug_err,
> opts.async[0])
> ret.append((opts, size, ug_err))
> return ret
>
> @@ -2268,7 +2268,7 @@ class _TH:
> if filename and _TH.dirty is None:
> try:
> for line in open(filename):
> - host, speed, fail, ts = line.split()
> + host, speed, fail, ts = line.split(' ', 3)
This is the bit that was tracebacking, right? We just going to tell
everyone to "yum clean all" ?
> _TH.hosts[host] = int(speed), int(fail), int(ts)
> except IOError: pass
> _TH.dirty = False
> @@ -2288,9 +2288,14 @@ class _TH:
> _TH.dirty = False
>
> @staticmethod
> - def update(url, dl_size, dl_time, ug_err):
> + def update(url, dl_size, dl_time, ug_err, baseurl=None):
> _TH.load()
> - host = urlparse.urlsplit(url).netloc
> +
> + # Use hostname from URL. If it's a file:// URL, use baseurl.
> + # If no baseurl, do not update timedhosts.
> + host = urlparse.urlsplit(url).netloc.split('@')[-1] or baseurl
> + if not host: return
> +
Is it worth putting this in a function?
ACK.
_______________________________________________
Yum-devel mailing list
Yum-devel@lists.baseurl.org
http://lists.baseurl.org/mailman/listinfo/yum-devel
