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

[cvs-log at otrs.org]

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

Modified Files:
      Tag: rel-2_0
	Defaults.pm 
Log Message:
Die if RELEASE file does not exist or isn't readable, because many system parts won't work without this file


Index: Defaults.pm
===================================================================
RCS file: /home/cvs/otrs/Kernel/Config/Defaults.pm,v
retrieving revision 1.222.2.9
retrieving revision 1.222.2.10
diff -C2 -r1.222.2.9 -r1.222.2.10
*** Defaults.pm	14 Jun 2006 16:29:43 -0000	1.222.2.9
--- Defaults.pm	4 Jul 2006 10:58:21 -0000	1.222.2.10
***************
*** 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';
                      }
                  }
--- 1679,1686 ----
                  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;
                      }
                  }
***************
*** 1688,1698 ****
          }
          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)
--- 1688,1698 ----
          }
          else {
!             print STDERR "ERROR: Can't read $Self->{Home}/RELEASE: $! This file is needed by central system parts of OTRS, the system will not work without this file.\n";
!             die;
          }
      }
      else {
!         print STDERR "ERROR: $Self->{Home}/RELEASE does not exist! This file is needed by central system parts of OTRS, the system will not work without this file.\n";
!         die;
      }
      # load config (again)