[linux] 02/04: abiupdate.py: Add support for incoming.ports.debian.org

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 2c8163e1f1afd52c1e53c18be502be7d07c68b90
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jan 7 18:00:21 2017 +0000

    abiupdate.py: Add support for incoming.ports.debian.org
---
 debian/bin/abiupdate.py | 11 ++++++-----
 debian/changelog        |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index cd6ad30..d35e50b 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -18,6 +18,7 @@ from debian_linux.debian import *
 default_url_base = "http://deb.debian.org/debian/"
 default_url_base_incoming = "http://incoming.debian.org/debian-buildd/"
 default_url_base_ports = "http://ftp.ports.debian.org/debian-ports/"
+default_url_base_ports_incoming = "http://incoming.ports.debian.org/"
 
 
 class url_debian_flat(object):
@@ -184,6 +185,7 @@ if __name__ == '__main__':
     options.add_option("-u", "--url-base", dest="url_base", default=default_url_base)
     options.add_option("--url-base-incoming", dest="url_base_incoming", default=default_url_base_incoming)
     options.add_option("--url-base-ports", dest="url_base_ports", default=default_url_base_ports)
+    options.add_option("--url-base-ports-incoming", dest="url_base_ports_incoming", default=default_url_base_ports_incoming)
 
     opts, args = options.parse_args()
 
@@ -198,15 +200,14 @@ if __name__ == '__main__':
     url_base = url_debian_pool(opts.url_base)
     url_base_incoming = url_debian_pool(opts.url_base_incoming)
     url_base_ports = url_debian_ports_pool(opts.url_base_ports)
+    url_base_ports_incoming = url_debian_flat(opts.url_base_ports_incoming)
     if opts.incoming_config:
         url = url_config = url_base_incoming
     else:
         url_config = url_base
-        if opts.incoming:
-            url = url_base_incoming
-        elif opts.ports:
-            url = url_base_ports
+        if opts.ports:
+            url = url_base_ports_incoming if opts.incoming else url_base_ports
         else:
-            url = url_base
+            url = url_base_incoming if opts.incoming else url_base
 
     Main(url, url_config, **kw)()
diff --git a/debian/changelog b/debian/changelog
index 958fec7..f37c74c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (4.9.1-1~exp2) UNRELEASED; urgency=medium
 
   * abiupdate.py: Use current config instead of downloading previous config
   * abiupdate.py: Update base URLs
+  * abiupdate.py: Add support for incoming.ports.debian.org
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 07 Jan 2017 17:41:34 +0000
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git