From fce1094295cb6860c57ff01c41f8cf66593269a1 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 27 Oct 2009 10:16:09 +0100 Subject: [PATCH] [molecule] remaster plugin: run chroot hooks before packages handling --- molecule/specs/plugins/remaster.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/molecule/specs/plugins/remaster.py b/molecule/specs/plugins/remaster.py index 59b3ab1..df169be 100644 --- a/molecule/specs/plugins/remaster.py +++ b/molecule/specs/plugins/remaster.py @@ -209,6 +209,10 @@ class ChrootHandler(BuiltinChrootHandler): def run(self): + rc = BuiltinChrootHandler.run(self) + if rc != 0: + return rc + self.Output.updateProgress("[%s|%s] %s" % ( blue("ChrootHandler"),darkred(self.spec_name), _("hooks running"), @@ -249,10 +253,6 @@ class ChrootHandler(BuiltinChrootHandler): if rc != 0: return rc - rc = BuiltinChrootHandler.run(self) - if rc != 0: - return rc - return 0