diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | methods/mirror.cc | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d02091f54..9fbcf0ad6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,6 +73,11 @@ apt (0.8.15) UNRELEASED; urgency=low * apt-pkg/packagemanager.cc: - ensure for Multi-Arch:same packages that they are unpacked in lock step even in immediate configuration (Closes: #618288) + + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors -- Michael Vogt <mvo@debian.org> Mon, 16 May 2011 14:57:52 +0200 diff --git a/methods/mirror.cc b/methods/mirror.cc index 2cf5c9ce1..8a7228def 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -274,8 +274,18 @@ bool MirrorMethod::InitMirrors() while (!in.eof()) { getline(in, s); - if (s.size() > 0) - AllMirrors.push_back(s); + + // ignore lines that start with # + if (s.find("#") == 0) + continue; + // ignore empty lines + if (s.size() == 0) + continue; + // ignore non http lines + if (s.find("http://") != 0) + continue; + + AllMirrors.push_back(s); } Mirror = AllMirrors[0]; UsedMirror = Mirror; |