[LON-CAPA-cvs] cvs: loncom /build distprobe
raeburn
lon-capa-cvs@mail.lon-capa.org
Thu, 31 May 2007 13:36:56 -0000
raeburn Thu May 31 09:36:56 2007 EDT
Modified files:
/loncom/build distprobe
Log:
Starting with Fedora 7, "Core" has been eliminated from the release name.
Index: loncom/build/distprobe
diff -u loncom/build/distprobe:1.12 loncom/build/distprobe:1.13
--- loncom/build/distprobe:1.12 Mon Apr 23 16:04:52 2007
+++ loncom/build/distprobe Thu May 31 09:36:53 2007
@@ -2,7 +2,7 @@
#
# The LearningOnline Network with CAPA
#
-# $Id: distprobe,v 1.12 2007/04/23 20:04:52 raeburn Exp $
+# $Id: distprobe,v 1.13 2007/05/31 13:36:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,8 +42,8 @@
} elsif ($version=~/^9/) {
$dist='redhat9';
}
- } elsif ($versionstring =~ /Fedora Core release ([\d\.]+) /) {
- my $version=$1;
+ } elsif ($versionstring =~ /Fedora( Core)? release ([\d\.]+) /) {
+ my $version=$2;
if ($version - int($version) > .9) {
$dist = 'fedora'.(int($version)+1);
} else {