X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=2b792f3c9ad7ecc098dc426fb89761bc000b65fe;hb=2d1714245f6df36ec2c7f2d7154b23e331f150a5;hp=cf73197d95b8d7021281c5e7c18d4de50378cb23;hpb=c4f604b868af6b0d7cfaf146e74e354f2485b3ef;p=dak.git

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index cf73197d..2b792f3c 100755
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -36,8 +36,6 @@ from daklib.filewriter import PackagesFileWriter, SourcesFileWriter
 
 import apt_pkg, os, stat, sys
 
-EXIT_STATUS = 0
-
 def usage():
     print """Usage: dak generate-packages-sources2 [OPTIONS]
 Generate the Packages/Sources files
@@ -121,7 +119,7 @@ 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)
 
 #############################################################################
 
@@ -225,7 +223,7 @@ 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)
 
 #############################################################################
 
@@ -269,11 +267,11 @@ def main():
         # Split out into (code, msg)
         code, msg = message
         if code == PROC_STATUS_SUCCESS:
-            Logger.log([msg])
+            logger.log([msg])
         elif code == PROC_STATUS_SIGNALRAISED:
-            Logger.log(['E: Subprocess recieved signal ', msg])
+            logger.log(['E: Subprocess recieved signal ', msg])
         else:
-            Logger.log(['E: ', msg])
+            logger.log(['E: ', msg])
 
     pool = DakProcessPool()
     for s in suites:
@@ -293,7 +291,7 @@ def main():
 
     logger.close()
 
-    sys.exit(pool.output_status())
+    sys.exit(pool.overall_status())
 
 if __name__ == '__main__':
     main()