From cca3fe10fe13a1dc70eb8082abd443a5caef8537 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 1 Jul 2008 20:54:53 +0000 Subject: [PATCH] Fix typos and stuff. --- source/utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/utils.py b/source/utils.py index 65750a9..23b45f2 100644 --- a/source/utils.py +++ b/source/utils.py @@ -93,7 +93,7 @@ def sysexec( cmd, log= None ): return 1 -_chroot_lib_copied = False +globals()['_chroot_lib_copied'] = False def sysexec_chroot( path, cmd, log= None ): """ same as sysexec, but inside a chroot @@ -103,11 +103,11 @@ def sysexec_chroot( path, cmd, log= None ): # 2.6.12 kernels need this if release[:5] == "2.6.1": library = "/lib/libc-opendir-hack.so" - if not _chroot_lib_copied: - shutil.copy("./libc-opendir-hack.so", "%s/%s" % (path, library)) - _chroot_lib_copied = True + if not globals()['_chroot_lib_copied']: + shutil.copy("./libc-opendir-hack.so", "%s%s" % (path, library)) + globals()['_chroot_lib_copied'] = True preload = "/bin/env LD_PRELOAD=%s" % library - sysexec("chroot %s %s %s" % (path, preload, cmd), log) + return sysexec("chroot %s %s %s" % (path, preload, cmd), log) def sysexec_chroot_noerr( path, cmd, log= None ): @@ -116,7 +116,7 @@ def sysexec_chroot_noerr( path, cmd, log= None ): """ try: rc= 0 - rc= syexec_chroot( cmd, log ) + rc= sysexec_chroot( cmd, log ) except BootManagerException, e: pass -- 2.47.0