[Treepkg-commits] r234 - trunk/treepkg

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-12-01 12:52:07 +0100 (Tue, 01 Dec 2009)
New Revision: 234

Modified:
   trunk/treepkg/packager.py
Log:
Move the should_stop check out of the try/except block so that it's not
skipped when a build fails.


Modified: trunk/treepkg/packager.py
===================================================================
--- trunk/treepkg/packager.py	2009-12-01 11:47:52 UTC (rev 233)
+++ trunk/treepkg/packager.py	2009-12-01 11:52:07 UTC (rev 234)
@@ -655,14 +655,14 @@
                     if packager:
                         packager.package()
                         repeat = self.install_dependencies(track, packager)
-                    if self.should_stop():
-                        logging.info("Received stop instruction.  Stopping.")
-                        return True
                 except:
                     logging.exception("An error occurred while"
                                       " checking packager track %r", track.name)
                     if self.stop_on_error:
                         raise
+                if self.should_stop():
+                    logging.info("Received stop instruction.  Stopping.")
+                    return True
                 if repeat:
                     logging.info("Built binaries needed by other tracks."
                                  " Starting over to ensure all dependencies"