[linux] 02/03: abiupdate.py: Add support for security mirrors

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch wheezy-security
in repository linux.

commit 1c951c591da167013ca0875ec55c725ffddae5c1
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Jan 12 02:33:17 2018 +0000

    abiupdate.py: Add support for security mirrors
    
    (cherry picked from commit 30fe681bffa1bf38f1fdd650ee8f3631e0f57015)
---
 debian/bin/abiupdate.py | 13 ++++++++++++-
 debian/changelog        |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index fbec1d4..0b4049d 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -16,6 +16,7 @@ from debian_linux.debian import *
 default_url_base = "http://ftp.de.debian.org/debian/"
 default_url_base_incoming = "http://incoming.debian.org/"
 default_url_base_ports = "http://ftp.debian-ports.org/debian/"
+default_url_base_security = "http://security.debian.org/"
 
 
 class url_debian_flat(object):
@@ -41,6 +42,11 @@ class url_debian_ports_pool(url_debian_pool):
         return self.base + "pool-" + arch + "/main/" + source[0] + "/" + source + "/" + filename
 
 
+class url_debian_security_pool(url_debian_pool):
+    def __call__(self, source, filename, arch):
+        return self.base + "pool/updates/main/" + source[0] + "/" + source + "/" + filename
+
+
 class Main(object):
     dir = None
 
@@ -177,9 +183,11 @@ if __name__ == '__main__':
     options.add_option("-i", "--incoming", action="store_true", dest="incoming")
     options.add_option("--incoming-config", action="store_true", dest="incoming_config")
     options.add_option("--ports", action="store_true", dest="ports")
+    options.add_option("--security", action="store_true", dest="security")
     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-security", dest="url_base_security", default=default_url_base_security)
 
     opts, args = options.parse_args()
 
@@ -194,11 +202,14 @@ if __name__ == '__main__':
     url_base = url_debian_pool(opts.url_base)
     url_base_incoming = url_debian_flat(opts.url_base_incoming)
     url_base_ports = url_debian_ports_pool(opts.url_base_ports)
+    url_base_security = url_debian_security_pool(opts.url_base_security)
     if opts.incoming_config:
         url = url_config = url_base_incoming
     else:
         url_config = url_base
-        if opts.incoming:
+        if opts.security:
+            url = url_base_security
+        elif opts.incoming:
             url = url_base_incoming
         elif opts.ports:
             url = url_base_ports
diff --git a/debian/changelog b/debian/changelog
index dbe4225..bae448b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux (3.2.96-4) UNRELEASED; urgency=medium
 
   * abiupdate.py: Use current config instead of downloading previous config
+  * abiupdate.py: Add support for security mirrors
 
  -- 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