Fix setup of online repositories in Leap 15.1 #7279
Conversation
czerw
changed the title
Fix poo#50309: Leap 15.1 changed behavior in setup of online repositories. It is triggered earlier in online_repos. Step installation_mode had to be updated too, to pass screen to next step. Order of repositories in setup_online_repos was changed.
| @@ -642,6 +643,10 @@ sub noupdatestep_is_applicable { | |||
| return !get_var("UPGRADE") && !get_var("LIVE_UPGRADE"); | |||
| } | |||
|
|
|||
| sub installwithaddonrepos_is_applicable { | |||
There was a problem hiding this comment.
utils is overcrowded already . also currently this function called only in single place - onlinerepos . maybe better just move it there ?
There was a problem hiding this comment.
Not single place, it is in main_common.pm
. And i moved it from main_common to utils. Or do you think that, there is better place than utils?
There was a problem hiding this comment.
installwithaddonrepos_is_applicable It looks a bit strange to use underscore only partly, but that's not a function created in this commit (old function from 1bacc65). LGTM.
There was a problem hiding this comment.
Not single place, it is in main_common.pm
os-autoinst-distri-opensuse/lib/main_common.pm
Line 537 in f0acb2d
if (installwithaddonrepos_is_applicable() && !get_var("LIVECD")) {
. And i moved it from main_common to utils. Or do you think that, there is better place than utils?
ah miss that , so let's leave it here than
| @@ -62,6 +63,9 @@ sub run { | |||
| # Test online repos dialog explicitly | |||
| if (get_var('DISABLE_ONLINE_REPOS')) { | |||
| disable_online_repos_explicitly; | |||
| } elsif (installwithaddonrepos_is_applicable() && !get_var("LIVECD")) { | |||
There was a problem hiding this comment.
with same reasoning ( function is called only here ) I woud move !get_var('LIVECD') inside a function. in current implementation it is not really clear why !get_var('UPGRADE') is part of function and !get_var('LIVECD') is not
There was a problem hiding this comment.
Same reason as above, function is used in main_common.pm.
There was a problem hiding this comment.
and in main common you also have exactly same line actually
installwithaddonrepos_is_applicable() && !get_var("LIVECD")
so why !get_var("LIVECD") is outside this function , for me it is still looks like it shoppuld be inside
There was a problem hiding this comment.
Well, it was already there in such state in main_common and I didn't want to touch what is not necessary.
| @@ -642,6 +643,10 @@ sub noupdatestep_is_applicable { | |||
| return !get_var("UPGRADE") && !get_var("LIVE_UPGRADE"); | |||
| } | |||
|
|
|||
| sub installwithaddonrepos_is_applicable { | |||
There was a problem hiding this comment.
installwithaddonrepos_is_applicable It looks a bit strange to use underscore only partly, but that's not a function created in this commit (old function from 1bacc65). LGTM.
Fix poo#50309: Leap 15.1 changed behavior in setup of online
repositories. It is triggered earlier in online_repos. Step
installation_mode had to be updated too, to pass screen to next step.
Order of repositories in setup_online_repos was changed.
Leap 15.1 with updates: http://10.100.12.105/tests/1888#step/online_repos/1
Leap 15.1 without updates: http://10.100.12.105/tests/1889#step/online_repos/1
Tumbleweed: http://10.100.12.105/tests/1892#step/online_repos/1
Leap 15.0 with updates: http://10.100.12.105/tests/1891#
Leap 15.0 without updates: http://10.100.12.105/tests/1890#step/online_repos/1
Leap 42.3 with updates: http://10.100.12.105/tests/1895#step/online_repos/1
Leap 42.3 without updates: http://10.100.12.105/tests/1893#step/online_repos/1