Skip to content

A
ansible
Commit 29434b06 by James Cammarata
Options

Merge pull request #7942 from sidred10/devel 

Fixed FreeBSD ports install issue
parents 5c959e7a 08370b3c
Showing with 5 additions and 6 deletions
library/packaging/portinstall
...@@ -99,15 +99,14 @@ def query_package(module, name): ...@@ -99,15 +99,14 @@ def query_package(module, name):
def matching_packages(module, name): def matching_packages(module, name):
ports_glob_path = module.get_bin_path('ports_glob', True) ports_glob_path = module.get_bin_path('ports_glob', True)
rc, out, err = module.run_command("%s %s | wc" % (ports_glob_path, name)) rc, out, err = module.run_command("%s %s" % (ports_glob_path, name))
parts = out.split() #counts the numer of packages found
occurrences = int(parts[0]) occurrences = out.count('\n')
if occurrences == 0: if occurrences == 0:
name_without_digits = re.sub('[0-9]', '', name) name_without_digits = re.sub('[0-9]', '', name)
if name != name_without_digits: if name != name_without_digits:
rc, out, err = module.run_command("%s %s | wc" % (ports_glob_path, name_without_digits)) rc, out, err = module.run_command("%s %s" % (ports_glob_path, name_without_digits))
parts = out.split() occurrences = out.count('\n')
occurrences = int(parts[0])
return occurrences return occurrences
......
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