* methods/mirror.cc:

  - ignore lines starting with "#" in the mirror file
  - ignore non http urls in the mirrors

diff --git a/debian/changelog b/debian/changelog
index d02091f540df72accc69b5f30e13b6405e039f81..9fbcf0ad6e99d7eafdd8731e8c095db5b7055fcd 100644 (file)
--- 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)
   * 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
 
 
  -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
 

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 2cf5c9ce1110a9d7f9b259cf9913451b89126d94..8a7228def45c43d20ef7a081b00cc7f3aee0675c 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -274,8 +274,18 @@ bool MirrorMethod::InitMirrors()
    while (!in.eof()) 
    {
       getline(in, s);
    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;
    }
    Mirror = AllMirrors[0];
    UsedMirror = Mirror;