* python/metaindex.cc

  - fix crash when incorrect attribute is given
* data/templates/Ubuntu.info.in:
  - updated to fix ports.ubuntu.com for powerpc and lpia
    (LP: #220890)
* aptsources/distro.py:
  - add parameter to get_distro() to make unit testing easier
* tests/test_aptsources_ports.py:
  - add test for arch specific handling (when sub arch is on
    a different mirror than "main" arches)
* python/acquire.cc (GetPkgAcqFile): Support DestDir and DestFilename.

1 files changed, 13 insertions, 6 deletions

diff --git a/aptsources/distro.py b/aptsources/distro.py
index 6d3b453f..f271bbc4 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -414,15 +414,22 @@ class UbuntuDistribution(Distribution):
     Distribution.get_mirrors(self,
                              mirror_template="http://%s.archive.ubuntu.com/ubuntu/")
 
-def get_distro():
-    ''' Check the currently used distribution and return the corresponding
-        distriubtion class that supports distro specific features. '''
-    lsb_info = []
-    for lsb_option in ["-i", "-c", "-d", "-r"]:
+def get_distro(id=None,codename=None,description=None,release=None):
+    """ 
+    Check the currently used distribution and return the corresponding
+    distriubtion class that supports distro specific features. 
+    
+    If no paramter are given the distro will be auto detected via
+    a call to lsb-release
+    """
+    # make testing easier
+    if not (id and codename and description and release):
+      lsb_info = []
+      for lsb_option in ["-i", "-c", "-d", "-r"]:
         pipe = os.popen("lsb_release %s -s" % lsb_option)
         lsb_info.append(pipe.read().strip())
         del pipe
-    (id, codename, description, release) = lsb_info
+      (id, codename, description, release) = lsb_info
     if id == "Ubuntu":
         return UbuntuDistribution(id, codename, description, 
                                   release)