[f18-branch/master] recheck software when source changes (#875599)

Chris Lumens clumens at redhat.com
Wed Dec 12 19:47:06 UTC 2012


> diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
> index 8fd4c59..64f0587 100644
> --- a/pyanaconda/ui/gui/spokes/software.py
> +++ b/pyanaconda/ui/gui/spokes/software.py
> @@ -81,7 +81,7 @@ class SoftwareSelectionSpoke(NormalSpoke):
>  
>          # Don't redo dep solving if nothing's changed.
>          if row[2] == self._origEnvironment and set(addons) == set(self._origAddons) and \
> -           not self._clickedRemove:
> +           not self._clickedRemove and self._tx_id == self.payload.txID:
>              return
>  
>          self._selectFlag = False

Ah, I like this change.  We're already doing a comparison in the
completed method too, so I wonder if it wouldn't be worth adding
something like this:

    @property
    def tx_valid(self):
       return self._tx_id == self.payload.txID

> @@ -153,6 +153,9 @@ class SoftwareSelectionSpoke(NormalSpoke):
>          if not self.ready:
>              return _("Installation source not set up")
>  
> +        if self._tx_id != self.payload.txID:
> +            return _("Source Changed")
> +
>          row = self._get_selected_environment()
>          if not row:
>              # Kickstart installs with %packages will have a row selected, unless

All other status lines in this spoke capitalize only the first word, so
I'd change that.

Also I wonder if we could have more explicit wording here to make it
clearer what's going on.  The fundamental problem is that we've made it
so the user has to go back into the software spoke just to check
everything's still okay.  I think we expect that most people are just
going to go in and right back out, because most people aren't going to
drastically change the source (like from F18 to F20, or whatever).

I wonder if wording more like "Source changed - please verify" might be
even more helpful in telling the user why we want them to go back in.

- Chris


More information about the anaconda-patches mailing list