Mercurial > piecrust2

diff piecrust/data/pagedata.py @ 877:d6d35b2efd04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bake: Rename "pass" to "step" and make the page pipeline use different steps. That pipeline is now first loading all pages, and then rendering full pages unless they trigger a sub-render.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 15 Jun 2017 22:16:23 -0700
parents f4608e2e80ce
children cc2647360036
line wrap: on
line diff
--- a/piecrust/data/pagedata.py	Thu Jun 15 07:33:40 2017 -0700
+++ b/piecrust/data/pagedata.py	Thu Jun 15 22:16:23 2017 -0700
@@ -1,6 +1,7 @@
 import time
 import logging
 import collections.abc
+from piecrust.sources.base import AbortedSourceUseError
 
 
 logger = logging.getLogger(__name__)
@@ -70,7 +71,7 @@
         if loader is not None:
             try:
                 self._values[name] = loader(self, name)
-            except LazyPageConfigLoaderHasNoValue:
+            except (LazyPageConfigLoaderHasNoValue, AbortedSourceUseError):
                 raise
             except Exception as ex:
                 logger.exception(ex)
@@ -90,7 +91,7 @@
         if loader is not None:
             try:
                 self._values[name] = loader(self, name)
-            except LazyPageConfigLoaderHasNoValue:
+            except (LazyPageConfigLoaderHasNoValue, AbortedSourceUseError):
                 raise
             except Exception as ex:
                 logger.exception(ex)