[kernel-team] 02/03: Remove script special cases for squeeze

[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 kernel-team.

commit 5cb90de1584565e7d430123c40a05311f45c5906
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Feb 7 21:54:47 2016 +0000

    Remove script special cases for squeeze
---
 scripts/benh/bts-reassign-to-linux | 23 ++++-------------------
 scripts/d-k-prerelease             |  5 -----
 scripts/d-k-tag                    |  2 +-
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/scripts/benh/bts-reassign-to-linux b/scripts/benh/bts-reassign-to-linux
index 43fa1cd..1e77036 100755
--- a/scripts/benh/bts-reassign-to-linux
+++ b/scripts/benh/bts-reassign-to-linux
@@ -54,17 +54,8 @@ class BtsTransaction(object):
 class BtsError(EnvironmentError):
     pass
 
-def linux_source_name(version):
-    if (apt_pkg.version_compare(version, '3.2.19-1') > 0 and
-        apt_pkg.version_compare(version, '3.3') < 0 or
-        apt_pkg.version_compare(version, '3.4.1-1') > 0):
-        return 'linux'
-    else:
-        return 'linux-2.6'
-
 def reassign(txn, report):
     if (report.source == 'linux' or
-        report.source.startswith('linux-2.6') or
         (report.source == '' and report.package.startswith('linux-image-'))):
         if report.found_versions:
             newest = None
@@ -73,18 +64,14 @@ def reassign(txn, report):
                     _, version = version.split('/')
                 if newest is None or apt_pkg.check_dep(version, '>', newest):
                     newest = version
-            txn.reassign(report.bug_num,
-                         'src:' + linux_source_name(newest), newest)
+            txn.reassign(report.bug_num, 'src:linux', newest)
         else:
             txn.reassign(report.bug_num, 'src:linux')
         for i in range(0, len(report.found_versions)):
             txn.found(report.bug_num, report.found_versions[i])
         for i in range(0, len(report.fixed_versions)):
             txn.fixed(report.bug_num, report.fixed_versions[i])
-    elif report.source == 'linux-latest' or \
-            report.source == 'linux-latest-2.6' or \
-            report.source == 'linux-2.6, linux-latest-2.6' or \
-            report.source == 'linux-latest, linux-latest-2.6':
+    elif report.source == 'linux-latest':
         log = debianbts.get_bug_log(report.bug_num)
         match = re.search(r'\n'
                           r'Versions of packages %s depends on:\n'
@@ -93,9 +80,7 @@ def reassign(txn, report):
                           % report.package,
                           log[0]['body'])
         if match:
-            txn.reassign(report.bug_num,
-                         'src:' + linux_source_name(match.group(1)),
-                         match.group(1))
+            txn.reassign(report.bug_num, 'src:linux', match.group(1))
         else:
             txn.reassign(report.bug_num, 'src:linux')
     else:
@@ -114,7 +99,7 @@ if __name__ == '__main__':
                                ['help', 'dry-run', 'quiet', 'verbose'])
     for opt, _ in opts:
         if opt == '-h' or opt == '--help':
-            print 'Usage: bts-reassign-to-linux-2.6 [--verbose|--quiet] [--dry-run] <bug#> ...'
+            print 'Usage: bts-reassign-to-linux [--verbose|--quiet] [--dry-run] <bug#> ...'
             sys.exit(0)
         elif opt == '-n' or opt == '--dry-run':
             DRY_RUN = True
diff --git a/scripts/d-k-prerelease b/scripts/d-k-prerelease
index 2e87b98..c5c1178 100755
--- a/scripts/d-k-prerelease
+++ b/scripts/d-k-prerelease
@@ -39,11 +39,6 @@ master)
 sid)
     dist=unstable
     ;;
-squeeze-security)
-    dist=squeeze-lts
-    # https://www.debian.org/doc/manuals/developers-reference/ch05.en.html#bug-security-building
-    urgency='high'
-    ;;
 *-security)
     dist=$branch
     # https://www.debian.org/doc/manuals/developers-reference/ch05.en.html#bug-security-building
diff --git a/scripts/d-k-tag b/scripts/d-k-tag
index 0ab325f..f29af16 100755
--- a/scripts/d-k-tag
+++ b/scripts/d-k-tag
@@ -16,7 +16,7 @@ branch="${head%...*}"
 # Check that distribution agrees with branch
 dist=$(dpkg-parsechangelog -S Distribution)
 case "$branch,$dist" in
-master,unstable | master,experimental | sid,unstable | squeeze-security,squeeze-lts)
+master,unstable | master,experimental | sid,unstable)
     # OK
     ;;
 *)

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