[otrs-cvs] CVS: otrs/Kernel/Config Defaults.pm,1.222.2.8,1.222.2.9

[cvs-log at otrs.org]

Update of /home/cvs/otrs/Kernel/Config
In directory lancelot:/tmp/cvs-serv20173

Modified Files:
      Tag: rel-2_0
	Defaults.pm 
Log Message:
Fixed bug #1206 - When no RELEASE file is available, no product and version is displaied and strange messages apear in the apache error log; using standard values in this case now


Index: Defaults.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Config/Defaults.pm,v
retrieving revision 1.222.2.8
retrieving revision 1.222.2.9
diff -C2 -r1.222.2.8 -r1.222.2.9
*** Defaults.pm	8 Jun 2006 06:56:12 -0000	1.222.2.8
--- Defaults.pm	14 Jun 2006 16:29:43 -0000	1.222.2.9
***************
*** 107,110 ****
--- 107,111 ----
      # if needed, oracle env settings
  #    $ENV{ORACLE_HOME} = '/opt/ora9/product/9.2';
+ 
  #    $ENV{ORACLE_HOME} = '/oracle/Ora92';
  #    $ENV{NLS_DATE_FORMAT} = 'YYYY-MM-DD HH24:MI:SS';
***************
*** 1678,1685 ****
                  if ($_ !~ /^#/) {
                      if ($_ =~ /^PRODUCT\s{0,2}=\s{0,2}(.*)\s{0,2}$/i) {
!                         $Self->{Product} = $1;
                      }
                      elsif ($_ =~ /^VERSION\s{0,2}=\s{0,2}(.*)\s{0,2}$/i) {
!                         $Self->{Version} = $1;
                      }
                  }
--- 1679,1686 ----
                  if ($_ !~ /^#/) {
                      if ($_ =~ /^PRODUCT\s{0,2}=\s{0,2}(.*)\s{0,2}$/i) {
!                         $Self->{Product} = $1 || 'OTRS';
                      }
                      elsif ($_ =~ /^VERSION\s{0,2}=\s{0,2}(.*)\s{0,2}$/i) {
!                         $Self->{Version} = $1 || 'x.y';
                      }
                  }
***************
*** 1687,1693 ****
          }
          else {
!             print STDERR "ERROR: Can't read $Self->{Home}/RELEASE: $!";
          }
      }
      # load config (again)
      $Self->Load();
--- 1688,1699 ----
          }
          else {
!             print STDERR "ERROR: Can't read $Self->{Home}/RELEASE: $!\n";
          }
      }
+     else {
+         print STDERR "ERROR: $Self->{Home}/RELEASE does not exist, using defaults!\n";
+         $Self->{Product} = 'OTRS';
+         $Self->{Version} = '(unknown)';
+     }
      # load config (again)
      $Self->Load();