QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deselect all addons correctly (#1333505)

Browse Source 
If depsolve failed with some (or all) addons selected it wasn't cleared
by deselecting all of them because the package and group set were never
cleared.

Add a check to skip this if the addons have not been changed (or never
set, as is the case with kickstart).

(cherry picked from commit 2ad90e9294517770372f82a14792379a49bec6a2 from
 anaconda)
Fixes QubesOS/qubes-issues#2105
This commit is contained in:
Brian C. Lane 2016-05-13 09:49:30 -07:00 committed by Marek Marczykowski-Górecki
parent 147941657f
commit cc03f3778d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
anaconda/pyanaconda/ui/gui/spokes/software.py
View File

@ -185,10 +185,13 @@ class SoftwareSelectionSpoke(NormalSpoke):
if not self.environment:
return
# NOTE: This block is skipped for kickstart where addons and _origAddons will
# both be [], preventing it from wiping out the kickstart's package selection
addons = self._get_selected_addons()
for group in addons:
if group not in self.selectedGroups:
self.selectedGroups.append(group)
if set(addons) != set(self._origAddons):
for group in addons:
if group not in self.selectedGroups:
self.selectedGroups.append(group)
self._selectFlag = False
self.payload.data.packages.packageList = []