X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_maintainers.py;h=7387e8ed7f6fb4ae8d84f4764b4e689bb2c363e3;hb=245c6549dbacaeab5ee36ec74372b1df8675b477;hp=30606e9a429a1fee4fbfb45776a42455895a7309;hpb=5e5ac0b54665306b3081dd9af625e0b02adc88ce;p=dak.git

diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py
index 30606e9a..7387e8ed 100755
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@ -47,6 +47,8 @@ def usage (exit_code=0):
 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)
@@ -69,9 +71,12 @@ def main():
     cnf = Config()
 
     Arguments = [('h',"help","Make-Maintainers::Options::Help"),
-                 ('a','archive','Make-Maintainers::Options::Archive','HasArg')]
-    if not cnf.has_key("Make-Maintainers::Options::Help"):
-        cnf["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.parse_commandline(cnf.Cnf, Arguments, sys.argv)
     Options = cnf.subtree("Make-Maintainers::Options")
@@ -110,11 +115,12 @@ def main():
         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
@@ -129,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()