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

Get the log directory from the configfile

Browse Source 
In the lorax script create it if missing and override it with the
path of --logfile
This commit is contained in:
Brian C. Lane 2015-02-10 12:05:23 -08:00
parent fe457ed71b
commit 9ff5897eee
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pylorax/__init__.py
View File

@ -87,6 +87,7 @@ class Lorax(BaseLoraxClass):
self.conf.add_section("lorax") self.conf.add_section("lorax")
self.conf.set("lorax", "debug", "1") self.conf.set("lorax", "debug", "1")
self.conf.set("lorax", "sharedir", "/usr/share/lorax") self.conf.set("lorax", "sharedir", "/usr/share/lorax")
self.conf.set("lorax", "logdir", "/var/log/lorax")
self.conf.add_section("output") self.conf.add_section("output")
self.conf.set("output", "colors", "1") self.conf.set("output", "colors", "1")
@ -179,7 +180,7 @@ class Lorax(BaseLoraxClass):
os.makedirs(self.workdir) os.makedirs(self.workdir)
# set up log directory # set up log directory
logdir = '/var/log/lorax' logdir = self.conf.get("lorax", "logdir")
if not os.path.isdir(logdir): if not os.path.isdir(logdir):
os.makedirs(logdir) os.makedirs(logdir)

3
src/sbin/lorax
View File

@ -171,6 +171,8 @@ def main(args):
parser.error("output directory %s should not exist." % outputdir) parser.error("output directory %s should not exist." % outputdir)
opts.logfile = os.path.abspath(opts.logfile) opts.logfile = os.path.abspath(opts.logfile)
if not os.path.exists(os.path.dirname(opts.logfile)):
os.makedirs(os.path.dirname(opts.logfile))
if opts.cachedir: if opts.cachedir:
opts.cachedir = os.path.abspath(opts.cachedir) opts.cachedir = os.path.abspath(opts.cachedir)
if opts.workdir: if opts.workdir:
@ -214,6 +216,7 @@ def main(args):
# run lorax # run lorax
lorax = pylorax.Lorax() lorax = pylorax.Lorax()
lorax.configure(conf_file=opts.config) lorax.configure(conf_file=opts.config)
lorax.conf.set("lorax", "logdir", os.path.dirname(opts.logfile))
lorax.run(dnfbase, opts.product, opts.version, opts.release, lorax.run(dnfbase, opts.product, opts.version, opts.release,
opts.variant, opts.bugurl, opts.isfinal, opts.variant, opts.bugurl, opts.isfinal,
workdir=tempdir, outputdir=outputdir, buildarch=opts.buildarch, workdir=tempdir, outputdir=outputdir, buildarch=opts.buildarch,