Changes to support 8.5 #64

Merged
lumarel merged 4 commits from fix-issue-62 into develop 2021-11-16 07:00:48 +00:00
19 changed files with 69 additions and 26 deletions

View File

@ -1267,13 +1267,11 @@ sub check_prerelease {
sub check_version { sub check_version {
# This function checks if the correct version is display during installation # This function checks if the correct version is display during installation
# in Anaconda, i.e. nonlive media showing Rawhide when Rawhide and version numbers # in Anaconda, it only looks at the major version, as these needles should
# when not Rawhide, while live media always showing version numbers. # not change between the major versions.
my $version = lc(get_var('VERSION')); my $version = lc(get_var('VERSION'));
if ($version eq 'rawhide' && get_var('LIVE')) { $version =~ s/\..+$//;
$version = get_var('RAWREL');
}
assert_screen "version_${version}_ident"; assert_screen "version_${version}_ident";
} }

View File

@ -0,0 +1,24 @@
{
"area": [
{
"ypos": 634,
"type": "match",
"height": 14,
"xpos": 706,
"width": 305
},
{
"type": "match",
"width": 105,
"height": 14,
"xpos": 873,
"ypos": 698
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-japanese",
"anaconda_install_done"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -12,6 +12,6 @@
"tags": [ "tags": [
"ENV-DISTRI-rocky", "ENV-DISTRI-rocky",
"LANGUAGE-arabic", "LANGUAGE-arabic",
"version_8.4_ident" "version_8_ident"
] ]
} }

View File

@ -12,6 +12,6 @@
"tags": [ "tags": [
"ENV-DISTRI-rocky", "ENV-DISTRI-rocky",
"LANGUAGE-french", "LANGUAGE-french",
"version_8.4_ident" "version_8_ident"
] ]
} }

View File

@ -12,6 +12,6 @@
"tags": [ "tags": [
"ENV-DISTRI-rocky", "ENV-DISTRI-rocky",
"LANGUAGE-japanese", "LANGUAGE-japanese",
"version_8.4_ident" "version_8_ident"
] ]
} }

View File

@ -1,16 +0,0 @@
{
"area": [
{
"xpos": 777,
"ypos": 12,
"width": 231,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"version_8.4_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

View File

@ -12,6 +12,6 @@
"tags": [ "tags": [
"ENV-DISTRI-rocky", "ENV-DISTRI-rocky",
"LANGUAGE-russian", "LANGUAGE-russian",
"version_8.4_ident" "version_8_ident"
] ]
} }

View File

@ -0,0 +1,21 @@
{
"area": [
{
"type": "match",
"height": 16,
"xpos": 778,
"ypos": 361,
"click_point": {
"xpos": 17,
"ypos": 1.5
},
"width": 88
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-french",
"anaconda_main_hub_network_host_name_not_connected"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 257,
"height": 12,
"width": 60,
"xpos": 387,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_logs_priority_text"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB