diff --git a/rel-eng/lorax_tito/__init__.py b/rel-eng/lorax_tito/__init__.py index ea0facbe..05f2153d 100644 --- a/rel-eng/lorax_tito/__init__.py +++ b/rel-eng/lorax_tito/__init__.py @@ -1,3 +1,3 @@ -from .tagger import LoraxRHELTagger +from lorax_tito.tagger import LoraxRHELTagger all = [LoraxRHELTagger] diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index ea3f8fa6..e9baa172 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -33,21 +33,21 @@ import locale from subprocess import CalledProcessError import selinux -from .base import BaseLoraxClass, DataHolder -import output +from pylorax.base import BaseLoraxClass, DataHolder +import pylorax.output as output import yum -import ltmpl +import pylorax.ltmpl as ltmpl -import imgutils -from sysutils import * +import pylorax.imgutils as imgutils +from pylorax.sysutils import * from rpmUtils.arch import getBaseArch -from treebuilder import RuntimeBuilder, TreeBuilder -from buildstamp import BuildStamp -from treeinfo import TreeInfo -from discinfo import DiscInfo -from executils import runcmd, runcmd_output +from pylorax.treebuilder import RuntimeBuilder, TreeBuilder +from pylorax.buildstamp import BuildStamp +from pylorax.treeinfo import TreeInfo +from pylorax.discinfo import DiscInfo +from pylorax.executils import runcmd, runcmd_output # get lorax version try: diff --git a/src/pylorax/base.py b/src/pylorax/base.py index 651c5b17..b7593b95 100644 --- a/src/pylorax/base.py +++ b/src/pylorax/base.py @@ -22,7 +22,7 @@ from abc import ABCMeta, abstractmethod import sys -import output +import pylorax.output as output class BaseLoraxClass(object): diff --git a/src/pylorax/ltmpl.py b/src/pylorax/ltmpl.py index 9060a4b0..510e6996 100644 --- a/src/pylorax/ltmpl.py +++ b/src/pylorax/ltmpl.py @@ -28,9 +28,9 @@ from os.path import basename, isdir from subprocess import CalledProcessError import shutil -from sysutils import joinpaths, cpfile, mvfile, replace, remove -from yumhelper import * # Lorax*Callback classes -from base import DataHolder +from pylorax.sysutils import joinpaths, cpfile, mvfile, replace, remove +from pylorax.yumhelper import * # Lorax*Callback classes +from pylorax.base import DataHolder from pylorax.executils import runcmd, runcmd_output from pylorax.imgutils import mkcpio diff --git a/src/pylorax/output.py b/src/pylorax/output.py index 9c2b3b8b..c5968594 100644 --- a/src/pylorax/output.py +++ b/src/pylorax/output.py @@ -22,7 +22,7 @@ import sys import re -import decorators +import pylorax.decorators as decorators # output levels diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index ef916701..2765ba34 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -23,11 +23,11 @@ logger = logging.getLogger("pylorax.treebuilder") import os, re from os.path import basename -from sysutils import joinpaths, remove +from pylorax.sysutils import joinpaths, remove from shutil import copytree, copy2 -from base import DataHolder -from ltmpl import LoraxTemplateRunner -import imgutils +from pylorax.base import DataHolder +from pylorax.ltmpl import LoraxTemplateRunner +import pylorax.imgutils as imgutils from pylorax.executils import runcmd, runcmd_output templatemap = { diff --git a/src/pylorax/yumhelper.py b/src/pylorax/yumhelper.py index a362bd29..85f16295 100644 --- a/src/pylorax/yumhelper.py +++ b/src/pylorax/yumhelper.py @@ -23,7 +23,7 @@ import logging logger = logging.getLogger("pylorax.yumhelper") import re import yum, yum.callbacks, yum.rpmtrans -import output +import pylorax.output as output __all__ = ['LoraxDownloadCallback', 'LoraxTransactionCallback', 'LoraxRpmCallback']