summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-12-15 09:32:24 +0000
committerintrigeri <intrigeri@boum.org>2017-12-15 09:32:24 +0000
commit19c77ee20544779281537f6d00a40b7ecc3c4a05 (patch)
tree226c59eb361b6bfebbd3b250e5ba6b2f2107bf4f
parent979da5282bab19b32af2a24e6c7942d3a9a70307 (diff)
ASP: clarify control flow.
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-additional-software3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-additional-software b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
index c6dd70c..78f426d 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software
+++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
@@ -94,6 +94,7 @@ def install_additional_packages():
"""The subcommand which activates and installs all additional packages
"""
syslog.syslog("Starting to install additional software...")
+
if has_additional_packages_list():
syslog.syslog("Found additional packages list")
elif os.path.isdir(PERSISTENCE_DIR):
@@ -106,11 +107,13 @@ def install_additional_packages():
syslog.syslog(syslog.LOG_WARNING,
"Warning: persistence is not mounted, exiting")
return True
+
try:
clear_obsolete_cache(OBSOLETE_APT_LIST_SUFFIX)
except:
syslog.syslog(syslog.LOG_WARNING,
"Warning: failed to clear obsolete cached packages")
+
packages = get_additional_packages()
if not packages:
syslog.syslog(syslog.LOG_WARNING,