Commit 8c1c6f13 authored by Aurélien Dunand's avatar Aurélien Dunand Committed by Sébastien Luttringer
Browse files

Allow to use embedded lib in embedded lib 



For example, if you have the following scripts in an image:
lib/
   |- 01-foo.py  (module 'foo')
   |- 02-bar.py  (module 'bar')
module 'bar' (and subsequent) could import and use content from module 'foo'.

Signed-off-by: default avatarSébastien Luttringer <sebastien.luttringer@smartjog.com>
parent ca30135f

installsystems/image.py

+26 −20
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ class Image(object): 
            raise ISError(u"Unable to compile %s" % filename, e)

        # load module

        try:

            exec bytecode in module.__dict__

            self.secure_exec_bytecode(bytecode, name, module.__dict__)

        except Exception as e:

            raise ISError(u"Unable to load %s" % filename, e)

        return module
@@ -148,9 +148,6 @@ class Image(object): 
        arrow(u"Run %s scripts" % scripts_name)

        # backup current directory and loaded modules

        cwd = os.getcwd()

        # system modules dict

        sysmodules = sys.modules

        sysmodules_backup = sysmodules.copy()

        for fp, fn, fc in select_scripts():

            # check input unicode stuff

            assert(isinstance(fp, unicode))
@@ -166,11 +163,23 @@ class Image(object): 
                bytecode = compile(fc, fn.encode(locale.getpreferredencoding()), "exec")

            except Exception as e:

                raise ISError(u"Unable to compile script %s" % fp, e)

            # autoload modules

            global_dict.update(self.modules)

            # add current image

            global_dict["image"] = self

            # execute source code

            self.secure_exec_bytecode(bytecode, fp, global_dict)

            arrowlevel(level=old_level)

        os.chdir(cwd)



    def secure_exec_bytecode(self, bytecode, path, global_dict):

        '''

        Execute bytecode in a clean modules' environment, without altering

        Installsystems' sys.modules

        '''

        # system modules dict

        sysmodules = sys.modules

        sysmodules_backup = sysmodules.copy()

        # autoload modules

        global_dict.update(self.modules)

        try:

            # replace system modules by image loaded

            # we must use the same directory and not copy it (probably C reference)
@@ -179,14 +188,11 @@ class Image(object): 
            sysmodules["sys"] = sys

            sysmodules.update(self.modules)

            exec bytecode in global_dict

                sysmodules.clear()

                sysmodules.update(sysmodules_backup)

        except Exception as e:

            raise ISError(u"Unable to execute script %s" % path, e)

        finally:

            sysmodules.clear()

            sysmodules.update(sysmodules_backup)

                raise ISError(u"Unable to execute script %s" % fp, e)

            arrowlevel(level=old_level)

        os.chdir(cwd)





class SourceImage(Image):