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

Merge pull request #859 from zecrazytux/bugfix/apt_repository

Browse source 
Bugfix/apt repository
This commit is contained in:
Michael DeHaan 2012-08-13 15:30:21 -07:00
commit a8d51a1508
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apt_repository
View file

@ -26,10 +26,9 @@
import platform import platform
APT = "/usr/bin/apt-get" APT = "/usr/bin/apt-get"
ADD_APT_REPOSITORY = None
def _find_binary(): def _find_binary(module):
binaries = ['/usr/bin/add-apt-repository'] binaries = ['/usr/bin/add-apt-repository']
for e in binaries: for e in binaries:
@ -48,6 +47,8 @@ def _run(cmd):
def main(): def main():
add_apt_repository = None
arg_spec = dict( arg_spec = dict(
repo=dict(required=True), repo=dict(required=True),
state=dict(default='present', choices=['present', 'absent']) state=dict(default='present', choices=['present', 'absent'])
@ -55,12 +56,12 @@ def main():
module = AnsibleModule(argument_spec=arg_spec) module = AnsibleModule(argument_spec=arg_spec)
ADD_APT_REPOSITORY = _find_binary() add_apt_repository = _find_binary(module)
repo = module.params['repo'] repo = module.params['repo']
state = module.params['state'] state = module.params['state']
rc, out, err = _run('%s %s --remove' % (ADD_APT_REPOSITORY, repo)) rc, out, err = _run('%s "%s" --remove' % (add_apt_repository, repo))
existed = 'Error' not in out existed = 'Error' not in out
if state == 'absent': if state == 'absent':
@ -69,9 +70,9 @@ def main():
else: else:
module.exit_json(changed=True, repo=repo, state=state) module.exit_json(changed=True, repo=repo, state=state)
cmd = '%s %s' % (ADD_APT_REPOSITORY, repo) cmd = '%s "%s"' % (add_apt_repository, repo)
if float(platform.dist()[1]) >= 11.10: if platform.dist()[0] == 'debian' or float(platform.dist()[1]) >= 11.10:
cmd = cmd + ' -y' cmd = cmd + ' -y'
rc, out, err = _run(cmd) rc, out, err = _run(cmd)