summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-11-21 07:17:39 +0000
committerTails developers <amnesia@boum.org>2013-11-21 07:17:39 +0000
commita29ef11d9482c3b1bc6c2c945b12d8d082afad75 (patch)
tree16e63f5144e791345a8d147243eeb736312089b5
parenteb2eff0863eeeb33badde61a74692d3680ad0a94 (diff)
additional software: always return a list as documented
This fixes a regression introduced by d6991d (Use new consistent path for additional software). Conflicts: config/chroot_local-includes/usr/local/sbin/tails-additional-software
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-additional-software13
1 files changed, 6 insertions, 7 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 b42f3de..12bb5b5 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software
+++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
@@ -66,14 +66,13 @@ def has_additional_packages_list():
def get_additional_packages():
"""Returns the list of all the additional packages
"""
- if not has_additional_packages_list():
- return None
packages = []
- with open(PACKAGES_LIST_FILE) as f:
- for line in f:
- line = line.strip()
- if line: packages.append(line)
- f.closed
+ if has_additional_packages_list():
+ with open(PACKAGES_LIST_FILE) as f:
+ for line in f:
+ line = line.strip()
+ if line: packages.append(line)
+ f.closed
return packages
def install_additional_packages():