Change isolinux local variable to instance variable

This commit is contained in:
Martin Gracik 2010-11-29 10:22:52 +01:00
parent 6bd104c627
commit a265f459bf
1 changed files with 7 additions and 7 deletions

View File

@ -106,12 +106,12 @@ class LoraxOutputTree(BaseLoraxClass):
shutil.copy2(isolinuxbin, self.isolinuxdir) shutil.copy2(isolinuxbin, self.isolinuxdir)
# copy syslinux.cfg # copy syslinux.cfg
isolinuxcfg = joinpaths(self.isolinuxdir, "isolinux.cfg") self.isolinuxcfg = joinpaths(self.isolinuxdir, "isolinux.cfg")
shutil.copy2(syslinuxcfg, isolinuxcfg) shutil.copy2(syslinuxcfg, self.isolinuxcfg)
# set product and version in isolinux.cfg # set product and version in isolinux.cfg
replace(isolinuxcfg, r"@PRODUCT@", self.product) replace(self.isolinuxcfg, r"@PRODUCT@", self.product)
replace(isolinuxcfg, r"@VERSION@", self.version) replace(self.isolinuxcfg, r"@VERSION@", self.version)
def get_memtest(self): def get_memtest(self):
# copy memtest # 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) fobj.write(text)
break break
@ -152,8 +152,8 @@ class LoraxOutputTree(BaseLoraxClass):
if os.path.isfile(vesasplash): if os.path.isfile(vesasplash):
shutil.copy2(vesasplash, joinpaths(self.isolinuxdir, "splash.jpg")) shutil.copy2(vesasplash, joinpaths(self.isolinuxdir, "splash.jpg"))
shutil.copy2(vesamenu, self.isolinuxdir) shutil.copy2(vesamenu, self.isolinuxdir)
replace(isolinuxcfg, r"default linux", "default vesamenu.c32") replace(self.isolinuxcfg, r"default linux", "default vesamenu.c32")
replace(isolinuxcfg, r"prompt 1", "#prompt 1") replace(self.isolinuxcfg, r"prompt 1", "#prompt 1")
elif os.path.isfile(splashtolss): elif os.path.isfile(splashtolss):
cmd = [splashtolss, syslinuxsplash, splashlss] cmd = [splashtolss, syslinuxsplash, splashlss]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE) p = subprocess.Popen(cmd, stdout=subprocess.PIPE)