| |
@@ -34,6 +34,15 @@
|
| |
# correct variables to compare the system data with.
|
| |
# First, we know the basic stuff
|
| |
my $id = get_var("DISTRI"); # Should be "fedora"
|
| |
+ my $isovar = get_var("ISO"); # Takes the build string for Silverblue variants.
|
| |
+ # Split the ISO variable at "-" and read fields 4 (release version)
|
| |
+ # and 5 (the build number).
|
| |
+ my ($sbver, $sbnum) = (split /-/, $isovar)[4, 5];
|
| |
+ # Get rid of the ".iso" part of the tag.
|
| |
+ $sbnum =~ s/\.iso//g;
|
| |
+ # Now, we merge the fields into one expression to create the correct Silverblue tag
|
| |
+ # that will contain both the version number and the build number.
|
| |
+ my $silvertag = "$sbver.$sbnum";
|
| |
my $name = ucfirst($id);
|
| |
my $version_id = get_var("VERSION"); # Should be the version number or Rawhide.
|
| |
my $varstr = spell_version_number($version_id);
|
| |
@@ -67,8 +76,17 @@
|
| |
}
|
| |
|
| |
my $version = "$version_id ($varstr)";
|
| |
+ # Version looks differently when the build is a Silverblue. We need to form
|
| |
+ # a different string here by using the above createad silvertag.
|
| |
+ if ($subvariant eq "Silverblue") {
|
| |
+ $version = "$silvertag ($varstr)";
|
| |
+ }
|
| |
my $platform_id = "platform:f$version_id";
|
| |
my $pretty = "$name $version_id ($varstr)";
|
| |
+ # Same problem is when testing the PRETTY_NAME.
|
| |
+ if ($subvariant eq "Silverblue") {
|
| |
+ $pretty = "$name $silvertag ($varstr)";
|
| |
+ }
|
| |
|
| |
#Now. we can start testing the real values from the installed system.
|
| |
my @fails = ();
|
| |
lruzicka
commented 4 years ago
This PR fixes #124.
It uses the BUILD variable to get the build string from the
tested compose and uses it to compare correct values for Silverblue.
Originally, it used Workstation values that did not match the
Silveblue ones.