4 Commits
v0.25 ... v0.26

Author SHA1 Message Date
kewl
dff3cfb450 Merge pull request #36 from juergenhoetzel/diff
Add diff support in check mode
2020-05-10 08:42:43 -04:00
Juergen Hoetzel
89e26748da Add diff support in check mode 2020-05-10 14:31:49 +02:00
kewl
de92aa87cb Merge pull request #34 from juergenhoetzel/on-the-fly-extract
Extract tar file on-the-fly
2020-05-09 10:40:18 -04:00
Juergen Hoetzel
5d952d26fd Extract tar file on-the-fly
Instead of creating an intermediate tar file use the open_url response
as fileobj.
2020-05-09 16:19:12 +02:00

View File

@@ -108,11 +108,17 @@ def check_packages(module, packages):
Inform the user what would change if the module were run
"""
would_be_changed = []
diff = {
'before': '',
'after': '',
}
for package in packages:
installed = package_installed(module, package)
if not installed:
would_be_changed.append(package)
if module._diff:
diff['after'] += package + "\n"
if would_be_changed:
status = True
@@ -126,7 +132,7 @@ def check_packages(module, packages):
message = 'all packages are already installed'
else:
message = 'package is already installed'
module.exit_json(changed=status, msg=message)
module.exit_json(changed=status, msg=message, diff=diff)
def install_with_makepkg(module, package):
@@ -140,22 +146,15 @@ def install_with_makepkg(module, package):
return (1, '', 'package {} not found'.format(package))
result = result['results'][0]
f = open_url('https://aur.archlinux.org/{}'.format(result['URLPath']))
current_path = os.getcwd()
with tempfile.TemporaryDirectory() as tmpdir:
os.chdir(tmpdir)
tar_file = '{}.tar.gz'.format(result['Name'])
with open(tar_file, 'wb') as out:
out.write(f.read())
tar = tarfile.open(tar_file)
tar.extractall()
tar = tarfile.open(mode='r|*', fileobj=f)
tar.extractall(tmpdir)
tar.close()
os.chdir(format(result['Name']))
if module.params['skip_pgp_check']:
use_cmd['makepkg'].append('--skippgpcheck')
if module.params['ignore_arch']:
use_cmd['makepkg'].append('--ignorearch')
rc, out, err = module.run_command(use_cmd['makepkg'], check_rc=True)
os.chdir(current_path)
rc, out, err = module.run_command(use_cmd['makepkg'], cwd=os.path.join(tmpdir, result['Name']), check_rc=True)
return (rc, out, err)