mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-29 10:01:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

transaction: Don't add deps or related for skipped ops

Browse Source 
Currently in the FlatpakTransaction implementation we add dependencies
and related refs for each operation in the transaction regardless of if
it's skipped or not. This is an issue in the case of an
end-of-life-rebased ref because in that case if the user agrees a new
install operation is added for the new ref, an uninstall operation is
added for the end-of-lifed ref, and the update operation for the
end-of-lifed one is marked as to be skipped. Then the dependencies of
the end-of-lifed ref get added to the transaction and ultimately after
all the sorting is done you end up with duplicate operations. In the
case of having org.gnome.tetravex installed, "flatpak update" yields a
transaction which uninstalls org.gnome.tetravex.Locale twice and errors
out on the second time (in addition to uninstalling org.gnome.tetravex
and installing org.gnome.Tetravex and org.gnome.Tetravex.Locale).

Fix the issue by skipping operations marked as to be skipped when adding
dependencies and related refs to the transaction.
This commit is contained in:
Matthew Leeds
2020-06-09 19:08:50 -07:00
committed by Alexander Larsson
parent c047a78f1e
commit e83ff0ca85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/flatpak-transaction.c
View File

@@ -3982,7 +3982,7 @@ flatpak_transaction_real_run (FlatpakTransaction *self,
{
FlatpakTransactionOperation *op = l->data;
if (!add_deps (self, op, error))
if (!op->skip && !add_deps (self, op, error))
return FALSE;
}
@@ -3995,7 +3995,7 @@ flatpak_transaction_real_run (FlatpakTransaction *self,
{
FlatpakTransactionOperation *op = l->data;
if (!add_related (self, op, error))
if (!op->skip && !add_related (self, op, error))
return FALSE;
}