X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=d29e0317f57890f18dd3f63d8e8e30b5500eb498;hb=50db22ea5f288daa39f81138a41a509d9a41cc3e;hp=769b79da0de74de51b5ca7dad6344f082530f05a;hpb=6d8a488ead5007c85e56c0e1055e4faf05206515;p=dak.git

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 769b79da..d29e0317 100755
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -28,13 +28,7 @@ Generate Packages/Sources files
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from daklib.dbconn import *
-from daklib.config import Config
-from daklib import utils, daklog
-from daklib.dakmultiprocessing import Pool
-from daklib.filewriter import PackagesFileWriter, SourcesFileWriter
-
-import apt_pkg, os, stat, sys
+import apt_pkg, sys
 
 def usage():
     print """Usage: dak generate-packages-sources2 [OPTIONS]
@@ -97,6 +91,9 @@ s.source, s.version
 
 def generate_sources(suite_id, component_id):
     global _sources_query
+    from daklib.filewriter import SourcesFileWriter
+    from daklib.dbconn import Component, DBConn, OverrideType, Suite
+    from daklib.dakmultiprocessing import PROC_STATUS_SUCCESS
 
     session = DBConn().session()
     dsc_type = session.query(OverrideType).filter_by(overridetype='dsc').one().overridetype_id
@@ -119,10 +116,13 @@ def generate_sources(suite_id, component_id):
 
     message = ["generate sources", suite.suite_name, component.component_name]
     session.rollback()
-    return message
+    return (PROC_STATUS_SUCCESS, message)
 
 #############################################################################
 
+# We currently filter out the "Tag" line. They are set by external overrides and
+# NOT by the maintainer. And actually having it set by maintainer means we output
+# it twice at the moment -> which breaks dselect.
 # Here be large dragons.
 _packages_query = R"""
 WITH
@@ -160,7 +160,7 @@ SELECT
      JOIN metadata_keys mk ON mk.key_id = bm.key_id
    WHERE
      bm.bin_id = tmp.binary_id
-     AND key != 'Section' AND key != 'Priority'
+     AND key != 'Section' AND key != 'Priority' AND key != 'Tag'
   )
   || COALESCE(E'\n' || (SELECT
      STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key)
@@ -194,11 +194,14 @@ WHERE
   AND
     o.type = :type_id AND o.suite = :overridesuite AND o.component = :component
 
-ORDER BY tmp.package, tmp.version
+ORDER BY tmp.source, tmp.package, tmp.version
 """
 
 def generate_packages(suite_id, component_id, architecture_id, type_name):
     global _packages_query
+    from daklib.filewriter import PackagesFileWriter
+    from daklib.dbconn import Architecture, Component, DBConn, OverrideType, Suite
+    from daklib.dakmultiprocessing import PROC_STATUS_SUCCESS
 
     session = DBConn().session()
     arch_all_id = session.query(Architecture).filter_by(arch_string='all').one().arch_id
@@ -225,11 +228,18 @@ def generate_packages(suite_id, component_id, architecture_id, type_name):
 
     message = ["generate-packages", suite.suite_name, component.component_name, architecture.arch_string]
     session.rollback()
-    return message
+    return (PROC_STATUS_SUCCESS, message)
 
 #############################################################################
 
 def main():
+    from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
+    pool = DakProcessPool()
+
+    from daklib.dbconn import Component, DBConn, get_suite, Suite
+    from daklib.config import Config
+    from daklib import daklog
+
     cnf = Config()
 
     Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"),
@@ -245,7 +255,7 @@ def main():
     if Options.has_key("Help"):
         usage()
 
-    logger = daklog.Logger(cnf, 'generate-packages-sources2')
+    logger = daklog.Logger('generate-packages-sources2')
 
     session = DBConn().session()
 
@@ -265,23 +275,36 @@ def main():
 
     component_ids = [ c.component_id for c in session.query(Component).all() ]
 
-    def log(details):
-        logger.log(details)
+    def parse_results(message):
+        # Split out into (code, msg)
+        code, msg = message
+        if code == PROC_STATUS_SUCCESS:
+            logger.log([msg])
+        elif code == PROC_STATUS_SIGNALRAISED:
+            logger.log(['E: Subprocess recieved signal ', msg])
+        else:
+            logger.log(['E: ', msg])
 
-    pool = Pool()
     for s in suites:
         if s.untouchable and not force:
             utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
         for c in component_ids:
-            pool.apply_async(generate_sources, [s.suite_id, c], callback=log)
+            pool.apply_async(generate_sources, [s.suite_id, c], callback=parse_results)
             for a in s.architectures:
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log)
-                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log)
+                if a == 'source':
+                    continue
+                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=parse_results)
+                pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=parse_results)
 
     pool.close()
     pool.join()
+
     # this script doesn't change the database
     session.close()
 
+    logger.close()
+
+    sys.exit(pool.overall_status())
+
 if __name__ == '__main__':
     main()