From: James Troup <james@nocrew.org>
Date: Fri, 2 Mar 2001 02:46:57 +0000 (+0000)
Subject: sync
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f963ffb12e516b2ce54f1c310fd8843668593a54;p=dak.git

sync
---

diff --git a/andrea b/andrea
index 618188a2..baa16860 100755
--- a/andrea
+++ b/andrea
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Check for fixable discrepancies between stable and unstable
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: andrea,v 1.1 2001-02-12 03:29:52 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: andrea,v 1.2 2001-03-02 02:47:29 troup Exp $
 
 # 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
@@ -21,8 +21,8 @@
 
 ################################################################################
 
-import pg, sys
-import utils, db_access
+import pg, string, sys;
+import utils, db_access;
 import apt_pkg;
 
 ################################################################################
@@ -69,10 +69,11 @@ def main ():
             continue;
         arch_id = db_access.get_architecture_id(arch);
         q = projectB.query("""
-SELECT b_src.package, b_src.version AS stable_version
-  FROM binaries b_src, bin_associations ba, override o 
+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 o.package = b_src.package AND o.suite = %s AND o.type != %s AND NOT EXISTS 
+        AND a.id = b_src.architecture AND o.package = b_src.package
+        AND o.suite = %s AND o.type != %s AND NOT EXISTS 
     (SELECT b_dst.id 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) 
@@ -81,11 +82,8 @@ SELECT b_src.package, b_src.version AS stable_version
                   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));
-        print
-        print arch
-        print "======"
-        print q
-        
+        for i in q.getresult():
+            print string.join(i, ' ');
 
 #######################################################################################
 
diff --git a/utils.py b/utils.py
index 0422e08d..66d28416 100644
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.16 2001-03-02 02:45:01 troup Exp $
+# $Id: utils.py,v 1.17 2001-03-02 02:46:57 troup Exp $
 
 # 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
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import commands, os, re, socket, shutil, stat, string, sys, tempfile, apt_pkg
+import commands, os, re, socket, shutil, stat, string, sys, tempfile
 
 re_comments = re.compile(r"\#.*")
 re_no_epoch = re.compile(r"^\d*\:")
@@ -57,8 +57,6 @@ def our_raw_input():
 
 ######################################################################################
 
-# Obsoleted by python >= 1.6
-
 def str_isnum (s):
     for c in s:
         if c not in string.digits: