gather: Expand wildcards in package names for nodeps
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
parent
fa752eb2b5
commit
7c7f997d74
@ -14,6 +14,7 @@
|
|||||||
# along with this program; if not, see <https://gnu.org/licenses/>.
|
# along with this program; if not, see <https://gnu.org/licenses/>.
|
||||||
|
|
||||||
from pprint import pformat
|
from pprint import pformat
|
||||||
|
from fnmatch import fnmatch
|
||||||
import six
|
import six
|
||||||
|
|
||||||
import pungi.arch
|
import pungi.arch
|
||||||
@ -63,7 +64,7 @@ class GatherMethodNodeps(pungi.phases.gather.method.GatherMethodBase):
|
|||||||
if not pkg_is_rpm(pkg):
|
if not pkg_is_rpm(pkg):
|
||||||
continue
|
continue
|
||||||
for gathered_pkg, pkg_arch in packages:
|
for gathered_pkg, pkg_arch in packages:
|
||||||
if isinstance(gathered_pkg, six.string_types) and pkg.name != gathered_pkg:
|
if isinstance(gathered_pkg, six.string_types) and not fnmatch(pkg.name, gathered_pkg):
|
||||||
continue
|
continue
|
||||||
elif (type(gathered_pkg) in [SimpleRpmWrapper, RpmWrapper]
|
elif (type(gathered_pkg) in [SimpleRpmWrapper, RpmWrapper]
|
||||||
and pkg.nevra != gathered_pkg.nevra):
|
and pkg.nevra != gathered_pkg.nevra):
|
||||||
|
Loading…
Reference in New Issue
Block a user