From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 26 Oct 2009 10:47:11 +0000 (+0100)
Subject: and another
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb4479b92fedd2b59991016e63d4eb65e5f6f6f3;p=dak

and another

another useless script gone.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/compare_suites.py b/dak/compare_suites.py
deleted file mode 100755
index 01652d94..00000000
--- a/dak/compare_suites.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-
-""" Check for fixable discrepancies between stable and unstable """
-# Copyright (C) 2000, 2001, 2002, 2003, 2006  James Troup <james@nocrew.org>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-################################################################################
-
-import pg, sys
-import apt_pkg
-from daklib import database
-from daklib import utils
-
-################################################################################
-
-Cnf = None
-projectB = None
-
-################################################################################
-
-def usage(exit_code=0):
-    print """Usage: dak compare-suites
-Looks for fixable descrepancies between stable and unstable.
-
-  -h, --help                show this help and exit."""
-    sys.exit(exit_code)
-
-################################################################################
-
-def main ():
-    global Cnf, projectB
-
-    Cnf = utils.get_conf()
-    Arguments = [('h',"help","Compare-Suites::Options::Help")]
-    for i in [ "help" ]:
-        if not Cnf.has_key("Compare-Suites::Options::%s" % (i)):
-            Cnf["Compare-Suites::Options::%s" % (i)] = ""
-
-    apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
-
-    Options = Cnf.SubTree("Compare-Suites::Options")
-    if Options["Help"]:
-        usage()
-
-    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    database.init(Cnf, projectB)
-
-    src_suite = "stable"
-    dst_suite = "unstable"
-
-    src_suite_id = database.get_suite_id(src_suite)
-    dst_suite_id = database.get_suite_id(dst_suite)
-    arch_all_id = database.get_architecture_id("all")
-    dsc_type_id = database.get_override_type_id("dsc")
-
-    for arch in database.get_suite_architectures(src_suite_id):
-        if arch == "source":
-            continue
-
-        # Arch: all doesn't work; consider packages which go from
-        # arch: all to arch: any, e.g. debconf... needs more checks
-        # and thought later.
-
-        if arch == "all":
-            continue
-        arch_id = database.get_architecture_id(arch)
-        q = projectB.query("""
-SELECT b_src.package, b_src.version, a.arch_string
-  FROM binaries b_src, bin_associations ba, override o, architecture a
-  WHERE ba.bin = b_src.id AND ba.suite = %s AND b_src.architecture = %s
-        AND a.id = b_src.architecture AND o.package = b_src.package
-        AND o.suite = %s AND o.type != %s AND NOT EXISTS
-    (SELECT 1 FROM bin_associations ba2, binaries b_dst
-       WHERE ba2.bin = b_dst.id AND b_dst.package = b_src.package
-             AND (b_dst.architecture = %s OR b_dst.architecture = %s)
-             AND ba2.suite = %s AND EXISTS
-               (SELECT 1 FROM bin_associations ba3, binaries b2
-                  WHERE ba3.bin = b2.id AND ba3.suite = %s AND b2.package = b_dst.package))
-ORDER BY b_src.package;"""
-                           % (src_suite_id, arch_id, dst_suite_id, dsc_type_id, arch_id, arch_all_id, dst_suite_id, dst_suite_id))
-        for i in q.getresult():
-            print " ".join(i)
-
-#######################################################################################
-
-if __name__ == '__main__':
-    main()
diff --git a/dak/dak.py b/dak/dak.py
index 9495644b..db2d3cf1 100755
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -131,8 +131,6 @@ def init():
          "Override cruft checks"),
         ("check-proposed-updates",
          "Dependency checking for proposed-updates"),
-        ("compare-suites",
-         "Show fixable discrepencies between suites"),
         ("control-overrides",
          "Manipulate/list override entries in bulk"),
         ("control-suite",