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

Re: [PATCH] Base install/upgrade default on whether any candidates were found (#590505).



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/12/2010 11:04 AM, Chris Lumens wrote:
> ---
>  pyanaconda/iw/examine_gui.py |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/pyanaconda/iw/examine_gui.py b/pyanaconda/iw/examine_gui.py
> index 1b8fbbf..d0aea3e 100644
> --- a/pyanaconda/iw/examine_gui.py
> +++ b/pyanaconda/iw/examine_gui.py
> @@ -85,13 +85,6 @@ class UpgradeExamineWindow (InstallWindow):
>          global seenExamineScreen
>          self.anaconda = anaconda
>  
> -        if not seenExamineScreen:
> -	    # this is the first time we've entered this screen
> -	    self.doupgrade = False
> -            seenExamineScreen = True
> -	else:
> -	    self.doupgrade = self.anaconda.upgrade
> -
>          # we might get here after storage reset that obsoleted
>          # root device objects we had found
>          if not self.anaconda.rootParts:
> @@ -101,6 +94,13 @@ class UpgradeExamineWindow (InstallWindow):
>  
>          self.parts = self.anaconda.rootParts
>  
> +        if not seenExamineScreen:
> +	    # this is the first time we've entered this screen
> +	    self.doupgrade = self.anaconda.upgrade or self.parts
> +            seenExamineScreen = True
> +	else:
> +	    self.doupgrade = self.anaconda.upgrade
> +
>          vbox = gtk.VBox (False, 12)
>  	vbox.set_border_width (8)
>  

Looks like some tabs/spaces problems there. Kill 'em with fire. Ack
otherwise.

- -- 
Brian C. Lane <bcl redhat com>
Red Hat / Port Orchard, WA
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
Comment: Remember Lexington Green!

iQEVAwUBTGSQDRF+jBaO/jp/AQKN+Qf/eh9fW+9en/yWzLbmbUvwpl2KoYapE8U5
6JNMe1omnEgfnGxrHfz5k4i7nPEAHZL6c5oDnTPJZ+hD0y3jc9cD1zsA3nyqD1e0
6hFrdiAYLPWZ7qGMt7nr+KyfXVLyW035qEmBBniFYm7NY8HhGZED2fBomMnKeOme
qJwSku/PjJQp85toJl9H3N1sck+2yiAXMfjNjVrI5wnjOTLeF/eErYc/IgFj1Q7B
ovHOsj5kZjErRpwfxM4cCXMWf+/TQsVTub7sI6LRiFFmfgOPsmqwnaSNGJ0P3q3Q
ZUmv/PRO/eUUUxED1Dn20NSzy60rGZl8HCzMfVsJlFFu9I6w8T51LQ==
=rEiW
-----END PGP SIGNATURE-----


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