---
src/pylorax/__init__.py | 47 ++++++++++++++++++++------------
src/pylorax/outputtree.py | 65 ---------------------------------------------
2 files changed, 29 insertions(+), 83 deletions(-)
delete mode 100644 src/pylorax/outputtree.py
diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index 995b07c..7e61df6 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -50,7 +50,6 @@ import constants
from sysutils import *
from installtree import LoraxInstallTree
-from outputtree import LoraxOutputTree
from buildstamp import BuildStamp
from treeinfo import TreeInfo
from discinfo import DiscInfo
@@ -337,15 +336,11 @@ class Lorax(BaseLoraxClass):
# get anaconda portions
self.installtree.get_anaconda_portions()
- # set up output tree
- self.outputtree = LoraxOutputTree(self.outputdir, self.installtree,
- self.product, self.version)
-
# write .discinfo
discinfo = DiscInfo(self.workdir, self.release, self.basearch)
discinfo.write()
- shutil.copy2(discinfo.path, self.outputtree.root)
+ shutil.copy2(discinfo.path, self.outputdir)
# move grubefi to workdir
grubefi = joinpaths(self.installtree.root, "boot/efi/EFI/redhat",
@@ -368,7 +363,25 @@ class Lorax(BaseLoraxClass):
splash = None
# copy kernels to output directory
- self.outputtree.get_kernels(self.workdir)
+ self.kernels = []
+
+ for n, kernel in enumerate(self.installtree.kernels):
+ suffix = ""
+ if kernel.ktype == constants.K_PAE:
+ suffix = "-PAE"
+ elif kernel.ktype == constants.K_XEN:
+ suffix = "-XEN"
+
+ kname = "vmlinuz{0}".format(suffix)
+
+ dst = joinpaths(self.workdir, kname)
+ shutil.copy2(kernel.fpath, dst)
+
+ # change the fname and fpath to new values
+ self.kernels.append(DataHolder(fname=kname,
+ fpath=dst,
+ version=kernel.version,
+ ktype=kernel.ktype))
# create .treeinfo
treeinfo = TreeInfo(self.workdir, self.product, self.version,
@@ -384,9 +397,9 @@ class Lorax(BaseLoraxClass):
if self.basearch in bcj:
cargs += " -Xbcj %s" % bcj.get(self.basearch)
- i = imgclass(kernellist=self.outputtree.kernels,
+ i = imgclass(kernellist=self.kernels,
installtree=self.installtree,
- outputroot=self.outputtree.root,
+ outputroot=self.outputdir,
product=self.product,
version=self.version,
treeinfo=treeinfo,
@@ -443,13 +456,11 @@ class Lorax(BaseLoraxClass):
efiboot = None
if grubefi and self.efiarch not in ("IA32",):
# create efibootdir
- self.outputtree.efibootdir = joinpaths(self.outputtree.root,
- "EFI/BOOT")
- os.makedirs(self.outputtree.efibootdir)
+ self.efibootdir = joinpaths(self.outputdir, "EFI/BOOT")
+ os.makedirs(self.efibootdir)
# set imgdir
- self.outputtree.imgdir = joinpaths(self.outputtree.root,
- "images")
+ self.imgdir = joinpaths(self.outputdir, "images")
kernel = i.kernels[0]
initrd = i.initrds[0]
@@ -483,8 +494,8 @@ class Lorax(BaseLoraxClass):
sys.exit(1)
# copy efiboot and efidisk to imgdir
- shutil.copy2(efiboot, self.outputtree.imgdir)
- shutil.copy2(efidisk, self.outputtree.imgdir)
+ shutil.copy2(efiboot, self.imgdir)
+ shutil.copy2(efidisk, self.imgdir)
# create boot iso
logger.info("creating boot iso")
@@ -492,7 +503,7 @@ class Lorax(BaseLoraxClass):
treeinfo.write()
- shutil.copy2(treeinfo.path, self.outputtree.root)
+ shutil.copy2(treeinfo.path, self.outputdir)
def get_buildarch(self):
# get architecture of the available anaconda package
@@ -603,7 +614,7 @@ class Lorax(BaseLoraxClass):
shutil.copy2(fpath, dst)
if not include_kernel:
- shutil.copy2(fpath, self.outputtree.efibootdir)
+ shutil.copy2(fpath, self.efibootdir)
# unmount the efiboot image
cmd = [self.lcmds.UMOUNT, efibootdir]
diff --git a/src/pylorax/outputtree.py b/src/pylorax/outputtree.py
deleted file mode 100644
index 6e22e8c..0000000
--- a/src/pylorax/outputtree.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# outputtree.py
-#
-# Copyright (C) 2010 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Red Hat Author(s): Martin Gracik <mgracik@xxxxxxxxxx>
-#
-
-import logging
-logger = logging.getLogger("pylorax.outputtree")
-
-import sys
-import os
-import shutil
-import glob
-import subprocess
-
-from base import BaseLoraxClass, DataHolder
-from sysutils import *
-import constants
-
-
-class LoraxOutputTree(BaseLoraxClass):
-
- def __init__(self, root, installtree, product, version):
- BaseLoraxClass.__init__(self)
- self.root = root
- self.installtree = installtree
-
- self.product = product
- self.version = version
-
- def get_kernels(self, workdir):
- self.kernels = []
-
- for n, kernel in enumerate(self.installtree.kernels):
- suffix = ""
- if kernel.ktype == constants.K_PAE:
- suffix = "-PAE"
- elif kernel.ktype == constants.K_XEN:
- suffix = "-XEN"
-
- kname = "vmlinuz{0}".format(suffix)
-
- dst = joinpaths(workdir, kname)
- shutil.copy2(kernel.fpath, dst)
-
- # change the fname and fpath to new values
- self.kernels.append(DataHolder(fname=kname,
- fpath=dst,
- version=kernel.version,
- ktype=kernel.ktype))
--
1.7.3.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
