Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
tails
tails
Commits
80e7496f
Commit
80e7496f
authored
Aug 28, 2018
by
Alan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASP: also gracefully remove ASP with target version
Will-fix:
#15822
parent
ebc4da01
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
config/chroot_local-includes/usr/local/sbin/tails-additional-software
...t_local-includes/usr/local/sbin/tails-additional-software
+5
-4
submodules/pythonlib
submodules/pythonlib
+1
-1
No files found.
config/chroot_local-includes/usr/local/sbin/tails-additional-software
View file @
80e7496f
...
...
@@ -462,22 +462,23 @@ def apt_hook_post():
packages
=
json
.
load
(
f
)
os
.
remove
(
ASP_STATE_PACKAGES
)
additional_packages
=
get_additional_packages
(
search_new_persistence
=
True
)
additional_packages_names
=
map
(
filter_package_details
,
get_additional_packages
(
search_new_persistence
=
True
))
apt_cache
=
apt
.
cache
.
Cache
()
# Filter automatically installed packages and packages already configured
# as additional software
new_manually_installed_packages
=
set
(
filter
(
lambda
pkg
:
not
apt_cache
[
pkg
].
is_auto_installed
and
pkg
not
in
map
(
filter_package_details
,
additional_packages
),
# NOQA: E131
and
pkg
not
in
additional_packages_names
,
# NOQA: E131
set
(
packages
[
"installed"
])))
if
new_manually_installed_packages
:
handle_installed_packages
(
new_manually_installed_packages
)
# Filter non-additional software packages
additional_packages_removed
=
set
(
packages
[
"removed"
]).
intersection
(
additional_packages
)
additional_packages
_names
)
if
additional_packages_removed
:
handle_removed_packages
(
additional_packages_removed
)
...
...
pythonlib
@
177079fc
Subproject commit
7b72784ac48dfb2b444d2f4331
bf
6
72
446c8b906
Subproject commit
177079fc262090da0b7309cb2fad
bf
8
72
f8c20c3
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment