Merge branch 'fix-pull-pkg' of git+ssh://git.launchpad.net/~xnox/ubuntu-dev-tools

MR: https://code.launchpad.net/~xnox/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/396459
Signed-off-by: Mattia Rizzolo <mattia@debian.org>

debian/changelog

@@ -19,6 +19,14 @@ ubuntu-dev-tools (0.178) UNRELEASED; urgency=medium
     + Limit bug description length to 50k chars to support Launchpad's limits.
       LP: #1193941
 
+  [ Dimitri John Ledkov ]
+  * pullpkg.py: fix --mirror option parsing.
+  * config.py: add UBUNTU_INTERNAL_MIRROR option, for launchpad internal
+    mirror.
+  * archive.py: use Regular, Ports, and Internal mirrors by default. Thus
+    enabling pull-lp-debs to work with ports architectures, and inside
+    launchpad builds too.
+
  -- Mattia Rizzolo <mattia@debian.org>  Tue, 22 Dec 2020 17:50:52 +0100
 
 ubuntu-dev-tools (0.177) unstable; urgency=medium

ubuntutools/archive.py

@@ -161,8 +161,13 @@ class SourcePackage(object):
         # Mirrors
         self.mirrors = list(mirrors)
         if self.distribution:
-            self.masters = [UDTConfig.defaults['%s_MIRROR'
-                                               % self.distribution.upper()]]
+            masters = []
+            for suffix in ["MIRROR", "PORTS_MIRROR", "INTERNAL_MIRROR"]:
+                masters.append(
+                    UDTConfig.defaults.get('%s_%s' %
+                                           (self.distribution.upper(),
+                                            suffix)))
+                self.masters = filter(None, masters)
 
         # if a dsc was specified, pull it to get the source/version info
         if self._dsc_source:

ubuntutools/config.py

@@ -43,6 +43,7 @@ class UDTConfig(object):
         'MIRROR_FALLBACK': True,
         'UBUNTU_MIRROR': 'http://archive.ubuntu.com/ubuntu',
         'UBUNTU_PORTS_MIRROR': 'http://ports.ubuntu.com',
+        'UBUNTU_INTERNAL_MIRROR': 'http://ftpmaster.internal/ubuntu',
         'UBUNTU_DDEBS_MIRROR': 'http://ddebs.ubuntu.com',
         'UPDATE_BUILDER': False,
         'WORKDIR': None,

ubuntutools/pullpkg.py

@@ -344,7 +344,7 @@ class PullPkg(object):
 
         mirrors = []
         if options['mirror']:
-            mirrors.append(options['mirror'])
+            mirrors.extend(options['mirror'])
         if pull == PULL_DDEBS:
             config = UDTConfig(options['no_conf'])
             ddebs_mirror = config.get_value(distro.upper() + '_DDEBS_MIRROR')