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

Merge conflict

Browse source
This commit is contained in:
Michael DeHaan 2013-06-18 20:18:17 -04:00
parent 69ff91505c
commit 03f1578768
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packaging/apt_key
View file

@ -129,15 +129,9 @@ def download_key(module, url):
module.fail_json(msg="error getting key id from url", traceback=format_exc())
<<<<<<< HEAD
def add_key(module, key):
cmd = "apt-key add -"
(rc, out, err) = module.run_command(cmd, data=key, check_rc=True, binary_data=True)
=======
def add_key(module, key, data=None):
cmd = "apt-key add %s" % (key)
(rc, out, err) = module.run_command(cmd, data=data, check_rc=True)
>>>>>>> 77159d21da40f6fcb0bfdcb1886f57acf68ea4f4
return True
def remove_key(module, key_id):