srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-22 05:53:09 +00:00
Code Issues Releases Activity

os_release: blow up on RC compose with prerelease fedora-release

Browse Source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-05-11 16:05:47 -07:00
parent 6f9ee2484c
commit 21ecfa8538
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/os_release.pm
View File

@ -91,8 +91,17 @@ sub run {
# If fedora-release-common release starts with a 0, we'll have # If fedora-release-common release starts with a 0, we'll have
# "Prerelease" in varstr # "Prerelease" in varstr
my $reltag = script_output 'rpm -q fedora-release-common --qf "%{RELEASE}\n"'; my $reltag = script_output 'rpm -q fedora-release-common --qf "%{RELEASE}\n"';
$varstr .= " Prerelease" if (index($reltag, "0.") == 0); if (index($reltag, "0.") == 0) {
$varstr .= " Prerelease";
# ...however, we shouldn't just wave this through if we're
# an RC candidate or update compose, those should never be
# done with a 0.x fedora-release-common. so let's blow up
# here if so
my $label = get_var("LABEL");
if ($label =~ /^(RC|Update)-/) {
die "RC candidate or update compose should not have 0.x versioned fedora-release!";
}
}
my $version = "$version_id ($varstr)"; my $version = "$version_id ($varstr)";
# for canned variants, we need to form a different string here by using # for canned variants, we need to form a different string here by using
# the above created cannedtag. See earlier comment # the above created cannedtag. See earlier comment