almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge #351 `Remove ambiguous imports`

This commit is contained in:
Dennis Gilmore 2016-07-26 13:54:44 +00:00
parent 22e94caf3c d51550da84
commit 664c5e54a3
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pungi/multilib.py
View File

@ -18,8 +18,8 @@
import re import re
import fnmatch import fnmatch
import pathmatch
import pungi.pathmatch
import pungi.gather import pungi.gather
@ -72,7 +72,7 @@ def read_runtime_patterns_from_file(path):
def expand_runtime_patterns(patterns): def expand_runtime_patterns(patterns):
pm = pathmatch.PathMatch() pm = pungi.pathmatch.PathMatch()
result = [] result = []
for path, pattern in patterns: for path, pattern in patterns:
for root in ("", "/opt/*/*/root"): for root in ("", "/opt/*/*/root"):

32
pungi/phases/__init__.py
View File

@ -16,19 +16,19 @@
# phases in runtime order # phases in runtime order
from init import InitPhase # noqa from .init import InitPhase # noqa
from pkgset import PkgsetPhase # noqa from .pkgset import PkgsetPhase # noqa
from gather import GatherPhase # noqa from .gather import GatherPhase # noqa
from createrepo import CreaterepoPhase # noqa from .createrepo import CreaterepoPhase # noqa
from product_img import ProductimgPhase # noqa from .product_img import ProductimgPhase # noqa
from buildinstall import BuildinstallPhase # noqa from .buildinstall import BuildinstallPhase # noqa
from extra_files import ExtraFilesPhase # noqa from .extra_files import ExtraFilesPhase # noqa
from createiso import CreateisoPhase # noqa from .createiso import CreateisoPhase # noqa
from live_images import LiveImagesPhase # noqa from .live_images import LiveImagesPhase # noqa
from image_build import ImageBuildPhase # noqa from .image_build import ImageBuildPhase # noqa
from test import TestPhase # noqa from .test import TestPhase # noqa
from image_checksum import ImageChecksumPhase # noqa from .image_checksum import ImageChecksumPhase # noqa
from livemedia_phase import LiveMediaPhase # noqa from .livemedia_phase import LiveMediaPhase # noqa
from ostree import OSTreePhase # noqa from .ostree import OSTreePhase # noqa
from ostree_installer import OstreeInstallerPhase # noqa from .ostree_installer import OstreeInstallerPhase # noqa
from osbs import OSBSPhase # noqa from .osbs import OSBSPhase # noqa

2
pungi/phases/gather/__init__.py
View File

@ -24,7 +24,7 @@ from kobo.rpmlib import parse_nvra
from productmd.rpms import Rpms from productmd.rpms import Rpms
from pungi.wrappers.scm import get_file_from_scm from pungi.wrappers.scm import get_file_from_scm
from link import link_files from .link import link_files
from pungi.util import get_arch_variant_data, get_arch_data from pungi.util import get_arch_variant_data, get_arch_data
from pungi.phases.base import PhaseBase from pungi.phases.base import PhaseBase