ASP: replace assert by raising an exception

assert is only evaluated if __debug__ is True and should not be used to check
for conditions.

Will-fix: #15838

config/chroot_local-includes/usr/local/bin/tails-additional-software-config

@@ -20,7 +20,7 @@ from tailslib.persistence import (                          # NOQA: E402
     is_tails_media_writable,
     launch_persistence_setup)
 
-from tailslib.additionalsoftware.config import (            # NOQA: E402
+from tailslib.additionalsoftware import (                   # NOQA: E402
     get_additional_packages,
     get_packages_list_path,
     filter_package_details)

config/chroot_local-includes/usr/local/sbin/tails-additional-software

@@ -15,7 +15,8 @@ import apt.cache
 
 from tailslib import LIVE_USERNAME
 
-from tailslib.additionalsoftware.config import (
+from tailslib.additionalsoftware import (
+    ASPDataError,
     add_additional_packages,
     filter_package_details,
     get_additional_packages,
@@ -415,7 +416,8 @@ def apt_hook_pre():
     removed_packages = []
 
     line = sys.stdin.readline()
-    assert line.startswith("VERSION 3")
+    if not line.startswith("VERSION 3"):
+        raise ASPDataError("APT data is not version 3")
     line = sys.stdin.readline()
     # Ignore configuration space, which ends with an empty line
     while line != "\n":

config/chroot_local-includes/usr/local/sbin/tails-additional-software-remove

@@ -2,7 +2,7 @@
 
 import sys
 
-from tailslib.additionalsoftware.config import (
+from tailslib.additionalsoftware import (
     remove_additional_packages,
     get_additional_packages)
 

pythonlib @ 63bf95c0

-Subproject commit 7b72784ac48dfb2b444d2f4331bf672446c8b906
+Subproject commit 63bf95c0b9a0376340d7690e2b681dad81dc8889

wiki/src/contribute/design/additional_software_packages.mdwn

@@ -165,7 +165,7 @@ When *Add To Persistent Storage* is clicked,
 `AdditionalSoftware` preset. The new additional packages are then added
 atomically to the `live-additional-software.conf` configuration file
 (this logic is handled by
-<https://git-tails.immerda.ch/pythonlib/plain/tailslib/additionalsoftware/config.py>)
+<https://git-tails.immerda.ch/pythonlib/plain/tailslib/additionalsoftware.py>)
 
 #### Without persistent storage