From 30f451c5b2e449288e86ccdeba8f0165cf0d00f0 Mon Sep 17 00:00:00 2001
From: Seblu <sebastien.luttringer@smartjog.com>
Date: Wed, 22 Jun 2011 18:54:13 +0200
Subject: [PATCH] Keep global dict between parser and setup
---
bin/isinstall | 9 +++++++--
installsystems/image.py | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/bin/isinstall b/bin/isinstall
index d36f469..b1878a7 100755
--- a/bin/isinstall
+++ b/bin/isinstall
@@ -74,12 +74,17 @@ try:
exit(1)
# install start time
t0 = time.time()
+ # global dict of execution context
+ gl_exec = { "parser": p_main }
# run parser scripts
- pkg.run_parser({ "parser": p_main })
+ pkg.run_parser(gl_exec)
# call parser again, with extended attributes
+ arrow("Run parser", 1, args.verbose)
args = p_main.parse_args()
+ # add parser result to global dict
+ gl_exec["args"] = args
# run setup scripts
- pkg.run_setup({"args": args})
+ pkg.run_setup(gl_exec)
# compute building time
t1 = time.time()
dt = int(t1 - t0)
diff --git a/installsystems/image.py b/installsystems/image.py
index f4900bf..08490e3 100644
--- a/installsystems/image.py
+++ b/installsystems/image.py
@@ -379,6 +379,7 @@ class PackageImage(Image):
'''
Run parser scripts
'''
+ gl["image"] = self
self._run_scripts(gl, "parser")
def run_setup(self, gl):
@@ -392,7 +393,7 @@ class PackageImage(Image):
'''
Run scripts in a tarball directory
'''
- arrow("Run %s" % directory, 1, self.verbose)
+ arrow("Run %s scripts" % directory, 1, self.verbose)
# get list of parser scripts
l_scripts = self._tarball.getnames("%s/.*\.py" % directory)
# order matter!
--
GitLab