loncom/build/distprobe - diff

Return to distprobe CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/distprobe between versions 1.7 and 1.13

version 1.7, 2004/11/01 21:53:23	version 1.13, 2007/05/31 13:36:53
Line 42 if (-e '/etc/redhat-release') {	Line 42 if (-e '/etc/redhat-release') {
} elsif ($version=~/^9/) {	} elsif ($version=~/^9/) {
$dist='redhat9';	$dist='redhat9';
}	}
} elsif ($versionstring =~ /Fedora Core release ([\d\.]+) /) {	} elsif ($versionstring =~ /Fedora( Core)? release ([\d\.]+) /) {
my $version=$1;	my $version=$2;
if ($version - int($version) > .9) {	if ($version - int($version) > .9) {
$dist = 'fedora'.(int($version)+1);	$dist = 'fedora'.(int($version)+1);
} else {	} else {
$dist = 'fedora'.int($version);	$dist = 'fedora'.int($version);
}	}
	} elsif ($versionstring =~ /Red Hat Enterprise Linux [AE]S release ([\d\.]+) /) {
	$dist = 'rhes'.$1;
	} elsif ($versionstring =~ /Red Hat Enterprise Linux Server release (\d+)/) {
	$dist = 'rhes'.$1;
} else {	} else {
warn('Unable to interpret /etc/redhat-release '.	warn('Unable to interpret /etc/redhat-release '.
'to determine system type');	'to determine system type');
Line 66 if (-e '/etc/redhat-release') {	Line 70 if (-e '/etc/redhat-release') {
my $versionstring=<IN>;	my $versionstring=<IN>;
chomp($versionstring);	chomp($versionstring);
close(IN);	close(IN);
if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /) {	if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /i) {
$dist='sles'.$1;	$dist='sles'.$1;
} elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /) {	} elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
	$dist = 'suse'.$1;
	} elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
$dist = 'suse'.$1;	$dist = 'suse'.$1;
} else {	} else {
warn('Unable to interpret /etc/SuSE-release '.	warn('Unable to interpret /etc/SuSE-release '.

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.7
changed lines
	Added in v.1.13