[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] (take II) Fix upgrade selected in UI after storage reset (#503302)



> diff --git a/iw/examine_gui.py b/iw/examine_gui.py
> index 334f3d1..e6fda9c 100644
> --- a/iw/examine_gui.py
> +++ b/iw/examine_gui.py
> @@ -90,6 +90,12 @@ class UpgradeExamineWindow (InstallWindow):
>  	else:
>  	    self.doupgrade = self.anaconda.id.upgrade
>  
> +        # we might get here after storage reset that obsoleted
> +        # root devices we had found
> +        if not self.anaconda.id.rootParts:
> +            self.anaconda.id.rootParts = upgrade.findExistingRoots(self.anaconda)
> +            self.anaconda.id.upgradeRoot = self.anaconda.id.rootParts[:]
> +
>          self.parts = self.anaconda.id.rootParts 
>  
>          vbox = gtk.VBox (False, 10)

This part is much simplified - I like it.  However, I don't think you
want the whole list assigned to upgradeRoot.  Keep in mind there could
be several root partitions available.  We do have users with many
different distributions installed at once.  upgradeRoot needs to be
assigned the one that's actually going to get upgraded.

> diff --git a/storage/__init__.py b/storage/__init__.py
> index a364bf8..685b59e 100644
> --- a/storage/__init__.py
> +++ b/storage/__init__.py
> @@ -298,6 +298,8 @@ class Storage(object):
>                                       luksDict=self.__luksDevs)
>          self.devicetree.populate()
>          self.fsset = FSSet(self.devicetree)
> +        self.anaconda.id.rootParts = None
> +        self.anaconda.id.upgradeRoot = None
>          w.pop()
>  
>      @property

This one makes me nervous.  I don't really want to say yes to it until
dlehman provides his opinion.

- Chris


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]