michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make version check take the release into account

Browse Source
This commit is contained in:
Jamie Cameron
2022-08-08 14:08:38 -07:00
parent 351850dec1
commit 6fc78a2104
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webmin/upgrade.cgi
View File

@@ -51,11 +51,16 @@ elsif ($in{'source'} == 2) {
&error_setup($text{'upgrade_err3'});
($ok, $version, $release) = &get_latest_webmin_version();
$ok || &inst_error($version);
$full = $version.($release ? "-$release" : "");
if (!$in{'force'}) {
if ($version == &get_webmin_version()) {
# Is the new version and release actually newer
$curr_rel = &get_webmin_version_release();
$curr_full = &get_webmin_version().
($curr_rel ? "-".$curr_rel : "");
if (&compare_version_numbers($full, $curr_full) == 0) {
&inst_error(&text('upgrade_elatest', $version));
}
elsif ($version <= &get_webmin_version()) {
elsif (&compare_version_numbers($full, $curr_full) < 0) {
&inst_error(&text('upgrade_eversion', $version));
}
}