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

Merge pull request #2932 from bcoca/apt_getbins

Browse source 
apt now uses module function to find bin paths
This commit is contained in:
Michael DeHaan 2013-05-18 13:13:04 -07:00
commit 223e4e2349
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/packaging/apt
View file

@ -118,8 +118,6 @@ import datetime
import fnmatch
# APT related constants
APTITUDE_CMD = "aptitude"
APT_GET_CMD = "apt-get"
APT_ENVVARS = "DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical"
DPKG_OPTIONS = '-o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold"'
APT_GET_ZERO = "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded."
@ -266,6 +264,9 @@ def main():
except:
module.fail_json(msg="Could not import python modules: apt, apt_pkg. Please install python-apt package.")
global APTITUDE_CMD = module.get_bin_path("aptitude", False)
global APT_GET_CMD = module.get_bin_path("apt-get")
p = module.params
install_recommends = p['install_recommends']