diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 873a56f8..04d13610 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -40,7 +40,7 @@ import yum import pylorax.ltmpl as ltmpl import pylorax.imgutils as imgutils -from pylorax.sysutils import * +from pylorax.sysutils import joinpaths, linktree, remove from rpmUtils.arch import getBaseArch from pylorax.treebuilder import RuntimeBuilder, TreeBuilder diff --git a/src/pylorax/ltmpl.py b/src/pylorax/ltmpl.py index 364ea221..9790334c 100644 --- a/src/pylorax/ltmpl.py +++ b/src/pylorax/ltmpl.py @@ -29,7 +29,7 @@ from subprocess import CalledProcessError import shutil from pylorax.sysutils import joinpaths, cpfile, mvfile, replace, remove -from pylorax.yumhelper import * # Lorax*Callback classes +from pylorax import yumhelper from pylorax.base import DataHolder from pylorax.executils import runcmd, runcmd_output from pylorax.imgutils import mkcpio @@ -514,9 +514,9 @@ class LoraxTemplateRunner(object): commands. ''' self.yum.buildTransaction() - self.yum.repos.setProgressBar(LoraxDownloadCallback()) - self.yum.processTransaction(callback=LoraxTransactionCallback(), - rpmDisplay=LoraxRpmCallback()) + self.yum.repos.setProgressBar(yumhelper.LoraxDownloadCallback()) + self.yum.processTransaction(callback=yumhelper.LoraxTransactionCallback(), + rpmDisplay=yumhelper.LoraxRpmCallback()) # verify if all packages that were supposed to be installed, # are really installed