almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Don't do wildcard imports

Browse Source
This commit is contained in:
Alexander Todorov 2017-10-12 17:51:06 +03:00 committed by Alexander Todorov
parent 24e0784256
commit d823501686
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pylorax/__init__.py
View File

@ -40,7 +40,7 @@ import yum
import pylorax.ltmpl as ltmpl import pylorax.ltmpl as ltmpl
import pylorax.imgutils as imgutils import pylorax.imgutils as imgutils
from pylorax.sysutils import * from pylorax.sysutils import joinpaths, linktree, remove
from rpmUtils.arch import getBaseArch from rpmUtils.arch import getBaseArch
from pylorax.treebuilder import RuntimeBuilder, TreeBuilder from pylorax.treebuilder import RuntimeBuilder, TreeBuilder

8
src/pylorax/ltmpl.py
View File

@ -29,7 +29,7 @@ from subprocess import CalledProcessError
import shutil import shutil
from pylorax.sysutils import joinpaths, cpfile, mvfile, replace, remove 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.base import DataHolder
from pylorax.executils import runcmd, runcmd_output from pylorax.executils import runcmd, runcmd_output
from pylorax.imgutils import mkcpio from pylorax.imgutils import mkcpio
@ -514,9 +514,9 @@ class LoraxTemplateRunner(object):
commands. commands.
''' '''
self.yum.buildTransaction() self.yum.buildTransaction()
self.yum.repos.setProgressBar(LoraxDownloadCallback()) self.yum.repos.setProgressBar(yumhelper.LoraxDownloadCallback())
self.yum.processTransaction(callback=LoraxTransactionCallback(), self.yum.processTransaction(callback=yumhelper.LoraxTransactionCallback(),
rpmDisplay=LoraxRpmCallback()) rpmDisplay=yumhelper.LoraxRpmCallback())
# verify if all packages that were supposed to be installed, # verify if all packages that were supposed to be installed,
# are really installed # are really installed