diff --git a/src/pylorax/discinfo.py b/src/pylorax/discinfo.py index 1bfd265c..24f435f4 100644 --- a/src/pylorax/discinfo.py +++ b/src/pylorax/discinfo.py @@ -23,22 +23,20 @@ import logging logger = logging.getLogger("pylorax.discinfo") import time -from sysutils import * +from sysutils import joinpaths class DiscInfo(object): - def __init__(self, workdir, release, basearch, discnum="ALL"): + def __init__(self, workdir, release, basearch): self.path = joinpaths(workdir, ".discinfo") self.release = release self.basearch = basearch - self.discnum = discnum def write(self): logger.info("writing .discinfo file") with open(self.path, "w") as fobj: fobj.write("{0:f}\n".format(time.time())) - fobj.write("{0}\n".format(self.release)) - fobj.write("{0}\n".format(self.basearch)) - fobj.write("{0}\n".format(self.discnum)) + fobj.write("{0.release}\n".format(self)) + fobj.write("{0.basearch}\n".format(self)) diff --git a/src/pylorax/treeinfo.py b/src/pylorax/treeinfo.py index ea9855a3..605c36e1 100644 --- a/src/pylorax/treeinfo.py +++ b/src/pylorax/treeinfo.py @@ -24,13 +24,13 @@ logger = logging.getLogger("pylorax.treeinfo") import ConfigParser import time -from sysutils import * +from sysutils import joinpaths class TreeInfo(object): def __init__(self, workdir, product, version, variant, basearch, - discnum=1, totaldiscs=1, packagedir=""): + packagedir=""): self.path = joinpaths(workdir, ".treeinfo") self.c = ConfigParser.ConfigParser() @@ -41,8 +41,6 @@ class TreeInfo(object): "version": version, "variant": variant or "", "arch": basearch, - "discnum": discnum, - "totaldiscs": totaldiscs, "packagedir": packagedir} self.c.add_section(section)