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

add missing imports to treebuilder (imgutils, fnmatch)

Browse Source
This commit is contained in:
Will Woods 2011-05-27 19:22:29 -04:00
parent c00a0afd21
commit bfc8dcdd7a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pylorax/treebuilder.py
View File

@ -20,7 +20,7 @@
import logging import logging
logger = logging.getLogger("pylorax.treebuilder") logger = logging.getLogger("pylorax.treebuilder")
import os, re, glob import os, re, glob, fnmatch
from os.path import basename, isdir, getsize from os.path import basename, isdir, getsize
from subprocess import check_call, PIPE from subprocess import check_call, PIPE
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
@ -29,7 +29,7 @@ from sysutils import joinpaths, cpfile, mvfile, replace, remove, linktree
from yumhelper import * from yumhelper import *
from ltmpl import LoraxTemplate from ltmpl import LoraxTemplate
from base import DataHolder from base import DataHolder
from imgutils import mkcpio import imgutils
templatemap = {'i386': 'x86.tmpl', templatemap = {'i386': 'x86.tmpl',
'x86_64': 'x86.tmpl', 'x86_64': 'x86.tmpl',
@ -201,7 +201,7 @@ class TreeBuilder(object):
'''Place the given files into a cpio archive and append that archive '''Place the given files into a cpio archive and append that archive
to the initrds.''' to the initrds.'''
cpio = NamedTemporaryFile(prefix="lorax.") # XXX workdir? cpio = NamedTemporaryFile(prefix="lorax.") # XXX workdir?
mkcpio(rootdir, cpio.name, compression=None) imgutils.mkcpio(rootdir, cpio.name, compression=None)
for kernel in self.kernels: for kernel in self.kernels:
cpio.seek(0) cpio.seek(0)
initrd_path = joinpaths(self.vars.inroot, kernel.initrd.path) initrd_path = joinpaths(self.vars.inroot, kernel.initrd.path)