[popfile-commit] engine/POPFile Configuration.pm,1.32,1.33

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv18062/POPFile

Modified Files:
	Configuration.pm 
Log Message:
Fix test suite failures

Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Configuration.pm	10 Nov 2003 20:55:35 -0000	1.32
--- Configuration.pm	10 Nov 2003 21:09:28 -0000	1.33
***************
*** 162,166 ****
      # may be running, warn the user and terminate
  
!     $self->{pid_file__} = $self->get_user_path_( $self->config_( 'piddir' ) . 'popfile.pid' );
  
      if (defined($self->live_check_())) {
--- 162,166 ----
      # may be running, warn the user and terminate
  
!     $self->{pid_file__} = $self->get_user_path( $self->config_( 'piddir' ) . 'popfile.pid' );
  
      if (defined($self->live_check_())) {
***************
*** 493,497 ****
      my ( $self ) = @_;
  
!     if ( open CONFIG, '<' . $self->get_user_path_( 'popfile.cfg' ) ) {
          while ( <CONFIG> ) {
              s/(\015|\012)//g;
--- 493,497 ----
      my ( $self ) = @_;
  
!     if ( open CONFIG, '<' . $self->get_user_path( 'popfile.cfg' ) ) {
          while ( <CONFIG> ) {
              s/(\015|\012)//g;
***************
*** 527,531 ****
      }
  
!     if ( open CONFIG, '>' . $self->get_user_path_( 'popfile.cfg' ) ) {
          $self->{save_needed__} = 0;
  
--- 527,531 ----
      }
  
!     if ( open CONFIG, '>' . $self->get_user_path( 'popfile.cfg' ) ) {
          $self->{save_needed__} = 0;
  
***************
*** 575,579 ****
      my ( $self, $left, $right ) = @_;
  
!     if ( ( $right =~ /^\// ) || ( $right =~ /^[A-Z]:\/\\/ ) ) {
          return $right;
      }
--- 575,579 ----
      my ( $self, $left, $right ) = @_;
  
!     if ( ( $right =~ /^\// ) || ( $right =~ /^[A-Z]:[\/\\]/ ) ) {
          return $right;
      }