starred/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-08-01 00:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

apt: Return calculated diff while running apt clean (#81247)

Browse Source 
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde
2023-07-14 05:27:05 +10:00
committed by GitHub
parent c3015c5eb1
commit c5e54be5ea
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/fragments/aptclean_diff.yml
+2
View File
@@ -0,0 +1,2 @@
minor_changes:
- apt - return calculated diff while running apt clean operation.
lib/ansible/modules/apt.py
+6 -7
View File
@@ -1031,15 +1031,13 @@ def cleanup(m, purge=False, force=False, operation=None,
def aptclean(m):
clean_rc, clean_out, clean_err = m.run_command(['apt-get', 'clean'])
if m._diff:
clean_diff = parse_diff(clean_out)
else:
clean_diff = {}
clean_diff = parse_diff(clean_out) if m._diff else {}
if clean_rc:
m.fail_json(msg="apt-get clean failed", stdout=clean_out, rc=clean_rc)
if clean_err:
m.fail_json(msg="apt-get clean failed: %s" % clean_err, stdout=clean_out, rc=clean_rc)
return clean_out, clean_err
return (clean_out, clean_err, clean_diff)
def upgrade(m, mode="yes", force=False, default_release=None,
@@ -1293,7 +1291,7 @@ def main():
p = module.params
if p['clean'] is True:
aptclean_stdout, aptclean_stderr = aptclean(module)
aptclean_stdout, aptclean_stderr, aptclean_diff = aptclean(module)
# If there is nothing else to do exit. This will set state as
# changed based on if the cache was updated.
if not p['package'] and not p['upgrade'] and not p['deb']:
@@ -1301,7 +1299,8 @@ def main():
changed=True,
msg=aptclean_stdout,
stdout=aptclean_stdout,
stderr=aptclean_stderr
stderr=aptclean_stderr,
diff=aptclean_diff
)
if p['upgrade'] == 'no':