openinteract-commits

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14635/OpenInteract2/Config

Modified Files:
	Package.pm 
Log Message:
OIN-111: ensure every package exported through management task is associated with a status message, even if it fails

Index: Package.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/Package.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Package.pm	26 Sep 2004 16:06:30 -0000	1.19
--- Package.pm	25 Jan 2005 02:47:24 -0000	1.20
***************
*** 5,14 ****
  use strict;
  use base qw( Class::Accessor::Fast );
! use File::Basename ();
! use File::Spec;
  use OpenInteract2::Exception qw( oi_error );
  
  $OpenInteract2::Config::Package::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
  
  use constant DEFAULT_FILENAME => 'package.conf';
  
--- 5,18 ----
  use strict;
  use base qw( Class::Accessor::Fast );
! use File::Basename           qw( dirname );
! use File::Spec::Functions    qw( catfile rel2abs );
! use Log::Log4perl            qw( get_logger );
! use OpenInteract2::Constants qw( :log );
  use OpenInteract2::Exception qw( oi_error );
  
  $OpenInteract2::Config::Package::VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
  
+ my ( $log );
+ 
  use constant DEFAULT_FILENAME => 'package.conf';
  
***************
*** 55,58 ****
--- 59,63 ----
  sub new {
      my ( $class, $params ) = @_;
+     $log ||= get_logger( LOG_OI );
      my $self = bless( {}, $class );
      my $filename  = $params->{filename};
***************
*** 60,63 ****
--- 65,71 ----
      if ( ! $filename and $directory ) {
          $filename = $self->create_filename( $directory );
+         $log->is_debug &&
+             $log->debug( "Will read package config from '$filename' ",
+                          "given directory '$directory'" );
      }
      if ( $filename and -f $filename ) {
***************
*** 65,69 ****
          $params->{ $_ } = $new_params->{ $_ } for ( keys %{ $new_params } );
          $self->filename( $filename );
!         $self->package_dir( File::Spec->rel2abs( File::Basename::dirname( $filename ) ) );
      }
      return $self->init( $params );
--- 73,77 ----
          $params->{ $_ } = $new_params->{ $_ } for ( keys %{ $new_params } );
          $self->filename( $filename );
!         $self->package_dir( rel2abs( dirname( $filename ) ) );
      }
      return $self->init( $params );
***************
*** 75,79 ****
          oi_error "Must pass in directory to create package config filename";
      }
!     return File::Spec->catfile( $dir, DEFAULT_FILENAME );
  }
  
--- 83,87 ----
          oi_error "Must pass in directory to create package config filename";
      }
!     return catfile( $dir, DEFAULT_FILENAME );
  }