diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2006-06-10 00:24:21 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2006-06-10 00:24:21 +0000 |
| commit | f32972e5a607aaa6f3031ad7744f94a417a27ba6 (patch) | |
| tree | f303f8c829a2394ce7ba34145aa0bd026a05cf9f | |
| parent | only show packages listed in grppkgs.txt if networkless (diff) | |
| download | gli-f32972e5a607aaa6f3031ad7744f94a417a27ba6.tar.gz gli-f32972e5a607aaa6f3031ad7744f94a417a27ba6.tar.bz2 gli-f32972e5a607aaa6f3031ad7744f94a417a27ba6.zip | |
src/GLIUtility.py:
minor tweak to regex for parsing mirrors.xml
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1457 f8877401-5920-0410-a79b-8e2d7e04ca0d
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/GLIUtility.py | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,6 +1,10 @@ # ChangeLog for Gentoo Linux Installer # Copyright 2005-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.650 2006/05/24 01:44:58 agaffney Exp $ +# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.651 2006/06/10 00:24:20 agaffney Exp $ + + 9 Jun 2006; Andrew Gaffney <agaffney@gentoo.org> + src/GLIUtility.py: + minor tweak to regex for parsing mirrors.xml 23 May 2006; Andrew Gaffney <agaffney@gentoo.org> src/templates/x86ArchitectureTemplate.py: diff --git a/src/GLIUtility.py b/src/GLIUtility.py index d19cfc4..1547b28 100644 --- a/src/GLIUtility.py +++ b/src/GLIUtility.py @@ -658,7 +658,7 @@ def list_mirrors(http=True, ftp=True, rsync=True): if mirrortypes: mirrortypes += '\|' mirrortypes += "rsync" - mirrorlist = spawn(r"wget -O - 'http://www.gentoo.org/main/en/mirrors.xml?passthru=1' 2>/dev/null | /bin/sed -ne '/^[[:space:]]\+<uri link=\"\(" + mirrortypes + r"\):\/\/[^\"]\+\">/{s/^[[:space:]]\+<uri link=\"\([^\"]\+\)\">\(.*\)<\/uri>.*$/\1|\2/;p}'", return_output=True)[1].strip().split("\n") + mirrorlist = spawn(r"wget -O - 'http://www.gentoo.org/main/en/mirrors.xml?passthru=1' 2>/dev/null | /bin/sed -ne '/^[[:space:]]*<uri link=\"\(" + mirrortypes + r"\):\/\/[^\"]\+\">/{s/^[[:space:]]*<uri link=\"\([^\"]\+\)\">\(.*\)<\/uri>.*$/\1|\2/;p}'", return_output=True)[1].strip().split("\n") for mirror in mirrorlist: mirror = mirror.strip() mirrors.append(mirror.split("|")) |