billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try harder to find perl modules.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-04-13 18:25:34 +01:00 • committed by Jelmer Vernooij
parent 6f4e571e2f
commit 205a929b90
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ognibuild/resolver/apt.py
View file

@ -608,18 +608,22 @@ def resolve_libtool_req(apt_mgr, req):
def resolve_perl_module_req(apt_mgr, req): def resolve_perl_module_req(apt_mgr, req):
DEFAULT_PERL_PATHS = ["/usr/share/perl5"] DEFAULT_PERL_PATHS = ["/usr/share/perl5", "/usr/lib/.*/perl5/.*"]
if req.inc is None: if req.inc is None:
if req.filename is None: if req.filename is None:
paths = [posixpath.join(inc, req.relfilename) for inc in DEFAULT_PERL_PATHS] paths = [posixpath.join(inc, re.escape(req.module.replace('::', '/') + '.pm')) for inc in DEFAULT_PERL_PATHS]
regex = True
elif not posixpath.isabs(req.filename): elif not posixpath.isabs(req.filename):
return False paths = [posixpath.join(inc, re.escape(req.filename)) for inc in DEFAULT_PERL_PATHS]
regex = True
else: else:
paths = [req.filename] paths = [req.filename]
regex = False
else: else:
regex = False
paths = [posixpath.join(inc, req.filename) for inc in req.inc] paths = [posixpath.join(inc, req.filename) for inc in req.inc]
return find_reqs_simple(apt_mgr, paths, regex=False) return find_reqs_simple(apt_mgr, paths, regex=regex)
def resolve_perl_file_req(apt_mgr, req): def resolve_perl_file_req(apt_mgr, req):