loncom/build/distprobe - diff

Return to distprobe CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/distprobe between versions 1.15 and 1.16

-version 1.15, 2009/06/28 14:22:04
+version 1.16, 2009/07/05 23:58:38
  Line 61  if (-e '/etc/redhat-release') {
          warn('Unable to interpret /etc/redhat-release '.
               'to determine system type');
      }
+ } elsif (-e '/etc/SuSE-release') {
+     open(IN,'</etc/SuSE-release');
+     my $versionstring=<IN>;
+     chomp($versionstring);
+     close(IN);
+     if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /i) {
+         $dist='sles'.$1;
+     } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
+         $dist = 'suse'.$1;
+     } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
+         $dist = 'suse'.$1;
+     } else {
+         warn('Unable to interpret /etc/SuSE-release '.
+              'to determine system type');
+     }
  } elsif (-e '/etc/issue') {
      open(IN,'</etc/issue');
      my $versionstring=<IN>;
- Line 96  if (-e '/etc/redhat-release') {
+ Line 111  if (-e '/etc/redhat-release') {
          warn('Unable to interpret /etc/debian_version '.
               'to determine system type');
      }
- } elsif (-e '/etc/SuSE-release') {
-     open(IN,'</etc/SuSE-release');
-     my $versionstring=<IN>;
-     chomp($versionstring);
-     close(IN);
-     if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /i) {
-         $dist='sles'.$1;
-     } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
-         $dist = 'suse'.$1;
-     } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
-         $dist = 'suse'.$1;
-     } else {
-         warn('Unable to interpret /etc/SuSE-release '.
-              'to determine system type');
-     }
  } else {
      warn('Unknown installation: expecting a debian, suse, or redhat system');
  }

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

Removed from v.1.15
changed lines
	Added in v.1.16