X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=dak%2Fmake_maintainers.py;h=7387e8ed7f6fb4ae8d84f4764b4e689bb2c363e3;hp=8e93f8af920e0a03d8810e29f6b490a535f35ec3;hb=17c5cab4eb8d5181ec7a81267a4e2e6b43c0fc65;hpb=0730e39dd59f8b699d5a2af9b4ca5aad66f0693b

diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py
index 8e93f8af..7387e8ed 100755
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@ -43,9 +43,12 @@ import sys
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: dak make-maintainers [OPTION] EXTRA_FILE[...]
+    print """Usage: dak make-maintainers [OPTION] -a ARCHIVE EXTRA_FILE[...]
 Generate an index of packages <=> Maintainers / Uploaders.
 
+  -a, --archive=ARCHIVE      archive to take packages from
+  -s, --source               output source packages only
+  -p, --print                print package list to stdout instead of writing it to files
   -h, --help                 show this help and exit
 """
     sys.exit(exit_code)
@@ -67,42 +70,57 @@ def uploader_list(source):
 def main():
     cnf = Config()
 
-    Arguments = [('h',"help","Make-Maintainers::Options::Help")]
-    if not cnf.has_key("Make-Maintainers::Options::Help"):
-        cnf["Make-Maintainers::Options::Help"] = ""
+    Arguments = [('h',"help","Make-Maintainers::Options::Help"),
+                 ('a',"archive","Make-Maintainers::Options::Archive",'HasArg'),
+                 ('s',"source","Make-Maintainers::Options::Source"),
+                 ('p',"print","Make-Maintainers::Options::Print")]
+    for i in ["Help", "Source", "Print" ]:
+        if not cnf.has_key("Make-Maintainers::Options::%s" % (i)):
+            cnf["Make-Maintainers::Options::%s" % (i)] = ""
 
-    extra_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Make-Maintainers::Options")
+    extra_files = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Make-Maintainers::Options")
 
-    if Options["Help"]:
+    if Options["Help"] or not Options.get('Archive'):
         usage()
 
     Logger = daklog.Logger('make-maintainers')
     session = DBConn().session()
 
+    archive = session.query(Archive).filter_by(archive_name=Options['Archive']).one()
+
     # dictionary packages to maintainer names
     maintainers = dict()
     # dictionary packages to list of uploader names
     uploaders = dict()
 
     source_query = session.query(DBSource).from_statement('''
-        select distinct on (source) * from source
-            order by source, version desc''')
+        select distinct on (source.source) source.* from source
+            join src_associations sa on source.id = sa.source
+            join suite on sa.suite = suite.id
+            where suite.archive_id = :archive_id
+            order by source.source, source.version desc''') \
+        .params(archive_id=archive.archive_id)
 
     binary_query = session.query(DBBinary).from_statement('''
-        select distinct on (package) * from binaries
-            order by package, version desc''')
+        select distinct on (binaries.package) binaries.* from binaries
+            join bin_associations ba on binaries.id = ba.bin
+            join suite on ba.suite = suite.id
+            where suite.archive_id = :archive_id
+            order by binaries.package, binaries.version desc''') \
+        .params(archive_id=archive.archive_id)
 
     Logger.log(['sources'])
     for source in source_query:
         maintainers[source.source] = source.maintainer.name
         uploaders[source.source] = uploader_list(source)
 
-    Logger.log(['binaries'])
-    for binary in binary_query:
-        if binary.package not in maintainers:
-            maintainers[binary.package] = binary.maintainer.name
-            uploaders[binary.package] = uploader_list(binary.source)
+    if not Options["Source"]:
+        Logger.log(['binaries'])
+        for binary in binary_query:
+                if binary.package not in maintainers:
+                    maintainers[binary.package] = binary.maintainer.name
+                    uploaders[binary.package] = uploader_list(binary.source)
 
     Logger.log(['files'])
     # Process any additional Maintainer files (e.g. from pseudo
@@ -117,17 +135,22 @@ def main():
             maintainers[package] = maintainer
             uploaders[package] = [maintainer]
 
-    maintainer_file = open('Maintainers', 'w')
-    uploader_file = open('Uploaders', 'w')
-    for package in sorted(uploaders):
-        maintainer_file.write(format(package, maintainers[package]))
-        for uploader in uploaders[package]:
-            uploader_file.write(format(package, uploader))
-    uploader_file.close()
-    maintainer_file.close()
-    Logger.close()
-
-################################################################################
+    if Options["Print"]:
+        for package in sorted(maintainers):
+            sys.stdout.write(format(package, maintainers[package]))
+    else:
+        maintainer_file = open('Maintainers', 'w')
+        uploader_file = open('Uploaders', 'w')
+        for package in sorted(uploaders):
+            maintainer_file.write(format(package, maintainers[package]))
+            for uploader in uploaders[package]:
+                uploader_file.write(format(package, uploader))
+        uploader_file.close()
+        maintainer_file.close()
+
+        Logger.close()
+
+###############################################################################
 
 if __name__ == '__main__':
     main()