Commit 3713b3b3 authored by Benjamin Winger's avatar Benjamin Winger

Moved pybuild module to portmod.pybuild to resolve ambiguity with the pybuild script

parent 6f04f2bb
......@@ -198,7 +198,7 @@ def import_mod(mod):
"""# Copyright 2019 Portmod Authors
# Distributed under the terms of the GNU General Public License v3
from pybuild import Pybuild1, InstallDir, File$includes
from portmod.pybuild import Pybuild1, InstallDir, File$includes
class Mod(Pybuild1):
NAME="${name}"
......
# Copyright 2019 Portmod Authors
# Distributed under the terms of the GNU General Public License v3
from pybuild.pybuild import ( # noqa # pylint: disable=unused-import
from .pybuild import ( # noqa # pylint: disable=unused-import
Pybuild1,
InstallDir,
File,
ModInfo,
)
from pybuild.util import tr_patcher # noqa # pylint: disable=unused-import
from .util import tr_patcher # noqa # pylint: disable=unused-import
from portmod.log import warn # noqa # pylint: disable=unused-import
from portmod.globals import DOWNLOAD_DIR # noqa # pylint: disable=unused-import
from portmod.util import patch_dir # noqa # pylint: disable=unused-import
......@@ -19,7 +19,7 @@ from portmod.repo.download import Source
from portmod.log import err
from portmod.colour import colour
from colorama import Fore
from portmod.pybuild import Pybuild
from ..pybuild_interface import Pybuild
import inspect
......
......@@ -20,7 +20,7 @@ from portmod.tsort import tsort
from portmod.masters import get_masters
from portmod.log import warn, err
from portmod.pybuild import Pybuild, InstalledPybuild
from ..pybuild_interface import Pybuild, InstalledPybuild
class DepError(Exception):
......
......@@ -13,7 +13,7 @@ from progressbar import ProgressBar, Percentage, Bar, ETA, FileTransferSpeed
from portmod.repo.util import get_hash
from portmod.globals import DOWNLOAD_DIR, PORTMOD_MIRRORS
from portmod.pybuild import Pybuild, Source
from ..pybuild_interface import Pybuild, Source
# Spaces are unweildy in download names. We enforce that source names in pybuilds
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment