Re: [PATCH newui 1/2] Network spoke: fix endless loop in refresh_ui (bad merge of patches)

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

 



ack to both

----- Original Message -----
> The removed block is a leftover of a (bad) approach to config
> refresh.
> 
> ---
>  pyanaconda/ui/gui/spokes/network.py |   14 +-------------
>  1 files changed, 1 insertions(+), 13 deletions(-)
> 
> diff --git a/pyanaconda/ui/gui/spokes/network.py
> b/pyanaconda/ui/gui/spokes/network.py
> index 0fe4295..c959eeb 100644
> --- a/pyanaconda/ui/gui/spokes/network.py
> +++ b/pyanaconda/ui/gui/spokes/network.py
> @@ -611,6 +611,7 @@ class NetworkControlBox():
>          ipv4cfg = None
>          ipv6cfg = None
>  
> +        # We might need to wait for config objects to become
> available
>          if num_of_tries > 0:
>              ipv4cfg = device.get_ip4_config()
>              ipv6cfg = device.get_ip6_config()
> @@ -619,19 +620,6 @@ class NetworkControlBox():
>                                                                   num_of_tries-1))
>                  return False
>  
> -        # We might need to wait for config objects to become
> available
> -        if device.get_state() ==
> NetworkManager.DeviceState.ACTIVATED:
> -            # Activating device with neither ipv4 nor ipv6
> configured shouldn't
> -            # loop endlessly so set timeout
> -            timeout = 1
> -            while timeout > 0 and not ipv4cfg and not ipv6cfg:
> -                while GLib.main_context_default().iteration(False):
> -                    pass
> -                ipv4cfg = device.get_ip4_config()
> -                ipv6cfg = device.get_ip6_config()
> -                time.sleep(0.3)
> -                timeout = timeout - 0.3
> -
>          dev_type = device.get_device_type()
>          if dev_type == NetworkManager.DeviceType.ETHERNET:
>              dt = "wired"
> --
> 1.7.4
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list
> 

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux