cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7942 from sidred10/devel

Browse source 
Fixed FreeBSD ports install issue
This commit is contained in:
James Cammarata 2014-06-26 11:50:33 -05:00
commit 8e6a60dfd6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packaging/portinstall
View file

@ -99,15 +99,14 @@ def query_package(module, name):
def matching_packages(module, name):
ports_glob_path = module.get_bin_path('ports_glob', True)
rc, out, err = module.run_command("%s %s | wc" % (ports_glob_path, name))
parts = out.split()
occurrences = int(parts[0])
rc, out, err = module.run_command("%s %s" % (ports_glob_path, name))
#counts the numer of packages found
occurrences = out.count('\n')
if occurrences == 0:
name_without_digits = re.sub('[0-9]', '', name)
if name != name_without_digits:
rc, out, err = module.run_command("%s %s | wc" % (ports_glob_path, name_without_digits))
parts = out.split()
occurrences = int(parts[0])
rc, out, err = module.run_command("%s %s" % (ports_glob_path, name_without_digits))
occurrences = out.count('\n')
return occurrences