almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

treeinfo fixup: fix treeinfo "instancemethod" error and hardlink()

Browse Source
This commit is contained in:
Will Woods 2011-05-10 02:15:02 -04:00
parent 9aa2e2c671
commit 644e5f4b55
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pylorax/treebuilder.py
View File

@ -21,6 +21,7 @@ import logging
logger = logging.getLogger("pylorax.treebuilder") logger = logging.getLogger("pylorax.treebuilder")
import os, re, glob import os, re, glob
from os.path import join, basename, isdir, getsize
from subprocess import check_call, PIPE from subprocess import check_call, PIPE
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
@ -134,7 +135,7 @@ class TreeBuilder(BaseBuilder):
initrd_path = joinpaths(self.inroot, kernel.initrd.path) initrd_path = joinpaths(self.inroot, kernel.initrd.path)
with open(initrd_path, "ab") as initrd: with open(initrd_path, "ab") as initrd:
logger.info("%s size before appending: %i", logger.info("%s size before appending: %i",
kernel.initrd.path, os.path.getsize(initrd.name)) kernel.initrd.path, getsize(initrd.name))
initrd.write(cpio.read()) initrd.write(cpio.read())
def implantisomd5(self): def implantisomd5(self):
@ -202,7 +203,7 @@ class TemplateRunner(object):
def mkdir(self, *dirs): def mkdir(self, *dirs):
for d in dirs: for d in dirs:
d = self._out(d) d = self._out(d)
if not os.path.isdir(d): if not isdir(d):
os.makedirs(d) os.makedirs(d)
def replace(self, pat, repl, *files): def replace(self, pat, repl, *files):
@ -214,7 +215,7 @@ class TemplateRunner(object):
fobj.write(data+"\n") fobj.write(data+"\n")
def treeinfo(self, section, key, *valuetoks): def treeinfo(self, section, key, *valuetoks):
if section not in self.treeinfo: if section not in self.treeinfo_data:
self.treeinfo_data[section] = dict() self.treeinfo_data[section] = dict()
self.treeinfo_data[section][key] = " ".join(valuetoks) self.treeinfo_data[section][key] = " ".join(valuetoks)
@ -227,6 +228,8 @@ class TemplateRunner(object):
self.treeinfo(section, "initrd", dest) self.treeinfo(section, "initrd", dest)
def hardlink(self, src, dest): def hardlink(self, src, dest):
if isdir(dest):
dest = join(dest, basename(src))
os.link(self._out(src), self._out(dest)) os.link(self._out(src), self._out(dest))
def symlink(self, target, dest): def symlink(self, target, dest):