Project

General

Profile

« Previous | Next » 

Revision 8d5ff32b

Added by Renato Botelho over 7 years ago

Detect when system is running a newer version than the one available on remote repository

View differences:

src/etc/inc/pkg-utils.inc
1251 1251
		return false;
1252 1252
	}
1253 1253

  
1254
	return array(
1254
	$result = array(
1255 1255
	    'version'           => $new_version ?: $pkg_info['version'],
1256 1256
	    'installed_version' => $pkg_info['installed_version']
1257 1257
	);
1258

  
1259
	$result['pkg_version_compare'] = pkg_version_compare(
1260
	    $result['installed_version'], $result['version']);
1261

  
1262
	return $result;
1258 1263
}
1259 1264

  
1260 1265
/* List available repos */
src/usr/local/www/pkg_mgr_install.php
555 555
}
556 556

  
557 557
$uptodatemsg = gettext("Up to date.");
558
$newerversionmsg = gettext("Running a newer version.");
558 559
$confirmlabel = gettext("Confirm Update");
559 560
$sysmessage = gettext("Status");
560 561

  
......
657 658
			$('#version').text(json.version);
658 659

  
659 660
			// If the installed and latest versions are the same, print an "Up to date" message
660
			if (json.installed_version == json.version) {
661
			if (json.pkg_version_compare == '=') {
661 662
				$('#confirmlabel').text("<?=$sysmessage?>");
662 663
				$('#uptodate').html('<span class="text-success">' + '<?=$uptodatemsg?>' + "</span>");
664
			} else if (json.pkg_version_compare == '>') {
665
				$('#confirmlabel').text("<?=$sysmessage?>");
666
				$('#uptodate').html('<span class="text-success">' + '<?=$newerversionmsg?>' + "</span>");
663 667
			} else { // If they differ display the "Confirm" button
664 668
				$('#uptodate').hide();
665 669
				$('#confirmlabel').text( "<?=$confirmlabel?>");
src/usr/local/www/widgets/widgets/system_information.widget.php
79 79
		exit;
80 80
	}
81 81

  
82
	$version_compare = pkg_version_compare(
83
	    $system_version['installed_version'], $system_version['version']);
84

  
85
	switch ($version_compare) {
82
	switch ($system_version['pkg_version_compare']) {
86 83
	case '<':
87 84
?>
88 85
		<div>

Also available in: Unified diff