Merge ~barryprice/+git/cleanup:master into ~hloeung/+git/cleanup:master

[Barry Price]

'apt-get autoclean' doesn't remove much - 'apt-get clean' removes all locally downloaded .deb files, which are unlikely to be needed again (and can be re-downloaded in any case)

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

diff --git a/README b/README
index 897a35e..d7847ab 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ Optional actions
   contains:
     Unattended-Upgrade::Remove-Unused-Dependencies "true";
   to mitigate https://bugs.launchpad.net/bugs/1357093
-- Run apt-get autoremove & apt-get autoclean.
+- Run apt-get autoremove & apt-get clean.
 - ksplice: Remove any directory in /var/cache/uptrack/Linux/x64_64 which
   doesn't match the running kernel.
 - Remove all kernel and kernel header packages which aren't either the running
diff --git a/actions.py b/actions.py
index 28e3c1d..7413ddc 100644
--- a/actions.py
+++ b/actions.py
@@ -512,11 +512,11 @@ class AptAutoremove(AptAction):
         return "Checking for removable packages"
 
 
-class AptAutoclean(AptAction):
-    """Run apt-get autoclean"""
+class AptClean(AptAction):
+    """Run apt-get clean"""
 
     def __init__(self, options):
-        AptAction.__init__(self, options, 'autoclean', re.compile('Del '))
+        AptAction.__init__(self, options, 'clean', re.compile('Del '))
 
     def check(self, options):
         if self.run_apt(options):
diff --git a/cleanup b/cleanup
index e3b21ee..8b6ae3a 100755
--- a/cleanup
+++ b/cleanup
@@ -152,7 +152,7 @@ def main():
 
     optional = [
         actions.AptAutoremove(options),
-        actions.AptAutoclean(options),
+        actions.AptClean(options),
         actions.InstallRemoveUnusedDependencies(options),
         actions.CleanKernels(options),
         actions.CleanUptrackCache(options),