From a265f459bf3b580125ca1680adea13490b902129 Mon Sep 17 00:00:00 2001 From: Martin Gracik Date: Mon, 29 Nov 2010 10:22:52 +0100 Subject: [PATCH] Change isolinux local variable to instance variable --- src/pylorax/outputtree.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pylorax/outputtree.py b/src/pylorax/outputtree.py index a1b5ccb0..165cd170 100644 --- a/src/pylorax/outputtree.py +++ b/src/pylorax/outputtree.py @@ -106,12 +106,12 @@ class LoraxOutputTree(BaseLoraxClass): shutil.copy2(isolinuxbin, self.isolinuxdir) # copy syslinux.cfg - isolinuxcfg = joinpaths(self.isolinuxdir, "isolinux.cfg") - shutil.copy2(syslinuxcfg, isolinuxcfg) + self.isolinuxcfg = joinpaths(self.isolinuxdir, "isolinux.cfg") + shutil.copy2(syslinuxcfg, self.isolinuxcfg) # set product and version in isolinux.cfg - replace(isolinuxcfg, r"@PRODUCT@", self.product) - replace(isolinuxcfg, r"@VERSION@", self.version) + replace(self.isolinuxcfg, r"@PRODUCT@", self.product) + replace(self.isolinuxcfg, r"@VERSION@", self.version) def get_memtest(self): # copy memtest @@ -128,7 +128,7 @@ class LoraxOutputTree(BaseLoraxClass): """ - with open(isolinuxcfg, "a") as fobj: + with open(self.isolinuxcfg, "a") as fobj: fobj.write(text) break @@ -152,8 +152,8 @@ class LoraxOutputTree(BaseLoraxClass): if os.path.isfile(vesasplash): shutil.copy2(vesasplash, joinpaths(self.isolinuxdir, "splash.jpg")) shutil.copy2(vesamenu, self.isolinuxdir) - replace(isolinuxcfg, r"default linux", "default vesamenu.c32") - replace(isolinuxcfg, r"prompt 1", "#prompt 1") + replace(self.isolinuxcfg, r"default linux", "default vesamenu.c32") + replace(self.isolinuxcfg, r"prompt 1", "#prompt 1") elif os.path.isfile(splashtolss): cmd = [splashtolss, syslinuxsplash, splashlss] p = subprocess.Popen(cmd, stdout=subprocess.PIPE)