X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fls.py;h=ea51aaeffcad698eea8d1beae643bd57a6c7eef9;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=85ad4905214114c6a4d89a0fe40437c575d2a40d;hpb=e216aa3f46d789c09ae9ca24a99885c89f1ebc0e;p=dak.git

diff --git a/dak/ls.py b/dak/ls.py
index 85ad4905..ea51aaef 100755
--- a/dak/ls.py
+++ b/dak/ls.py
@@ -80,8 +80,8 @@ def main ():
         if not cnf.has_key("Ls::Options::%s" % (i)):
             cnf["Ls::Options::%s" % (i)] = ""
 
-    packages = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Ls::Options")
+    packages = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Ls::Options")
 
     if Options["Help"]:
         usage()
@@ -135,22 +135,25 @@ def main ():
         q = session.execute("""
 SELECT b.package, b.version, a.arch_string, su.suite_name, c.name, m.name
   FROM binaries b, architecture a, suite su, bin_associations ba,
-       files f, location l, component c, maintainer m
+       files f, files_archive_map af, component c, maintainer m
  WHERE b.package %s :package AND a.id = b.architecture AND su.id = ba.suite
-   AND b.id = ba.bin AND b.file = f.id AND f.location = l.id
-   AND l.component = c.id AND b.maintainer = m.id %s %s %s
+   AND b.id = ba.bin AND b.file = f.id AND af.file_id = f.id AND su.archive_id = af.archive_id
+   AND af.component_id = c.id AND b.maintainer = m.id %s %s %s
 """ % (comparison_operator, con_suites, con_architectures, con_bintype), {'package': package})
         ql = q.fetchall()
         if check_source:
             q = session.execute("""
 SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name
-  FROM source s, suite su, src_associations sa, files f, location l,
+  FROM source s, suite su, src_associations sa, files f, files_archive_map af,
        component c, maintainer m
  WHERE s.source %s :package AND su.id = sa.suite AND s.id = sa.source
-   AND s.file = f.id AND f.location = l.id AND l.component = c.id
+   AND s.file = f.id AND af.file_id = f.id AND af.archive_id = su.archive_id AND af.component_id = c.id
    AND s.maintainer = m.id %s
 """ % (comparison_operator, con_suites), {'package': package})
-            ql.extend(q.fetchall())
+            if not Options["Architecture"] or con_architectures:
+                ql.extend(q.fetchall())
+            else:
+                ql = q.fetchall()
         d = {}
         highver = {}
         for i in ql:
@@ -163,7 +166,7 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name
             highver.setdefault(pkg,"")
             if not d[pkg].has_key(version):
                 d[pkg][version] = {}
-                if apt_pkg.VersionCompare(version, highver[pkg]) > 0:
+                if apt_pkg.version_compare(version, highver[pkg]) > 0:
                     highver[pkg] = version
             if not d[pkg][version].has_key(suite):
                 d[pkg][version][suite] = []
@@ -173,7 +176,7 @@ SELECT s.source, s.version, 'source', su.suite_name, c.name, m.name
         packages.sort()
         for pkg in packages:
             versions = d[pkg].keys()
-            versions.sort(apt_pkg.VersionCompare)
+            versions.sort(apt_pkg.version_compare)
             for version in versions:
                 suites = d[pkg][version].keys()
                 suites.sort()