Merge git://anonscm.debian.org/apt/python-apt

Conflicts:
	debian/changelog
	python/apt_pkgmodule.cc

1 files changed, 9 insertions, 3 deletions

diff --git a/utils/get_debian_mirrors.py b/utils/get_debian_mirrors.py
index c1ec3be8..de4ebb95 100755
--- a/utils/get_debian_mirrors.py
+++ b/utils/get_debian_mirrors.py
@@ -17,7 +17,9 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
+from __future__ import print_function
 import collections
+import sys
 import urllib2
 from debian_bundle import deb822
 
@@ -27,7 +29,7 @@ masterlist = urllib2.urlopen("http://anonscm.debian.org/viewvc/"
                              "mirror/Mirrors.masterlist?revision=HEAD")
 
 for mirror in deb822.Deb822.iter_paragraphs(masterlist):
-    if not "Country" in mirror:
+    if "Country" not in mirror:
         continue
     country = mirror["Country"].split(None, 1)[0]
     site = mirror["Site"]
@@ -36,6 +38,10 @@ for mirror in deb822.Deb822.iter_paragraphs(masterlist):
             mirrors[country].add("%s://%s%s" % (proto, site,
                                                 mirror["Archive-%s" % proto]))
 
+if len(mirrors) == 0:
+    sys.stderr.write("E: Could not read the mirror list due to "
+                     "some unknown issue\n")
+    sys.exit(1)
 for country in sorted(mirrors):
-    print "#LOC:%s" % country
-    print "\n".join(sorted(mirrors[country]))
+    print("#LOC:%s" % country)
+    print("\n".join(sorted(mirrors[country])))