X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FApp%2FRgit%2FConfig.pm;h=7a247eb7dc67357b73d018a3c884eeb12ba5a5fa;hb=20ecc90aa6c17a07fd1200d0bf72d5918e53e106;hp=1cac51d6a75854b7c2e8c9c78f216ec717d09106;hpb=1c5bf56c6f80e4cd818c341b34ba3410f34ed514;p=perl%2Fmodules%2Frgit.git

diff --git a/lib/App/Rgit/Config.pm b/lib/App/Rgit/Config.pm
index 1cac51d..7a247eb 100644
--- a/lib/App/Rgit/Config.pm
+++ b/lib/App/Rgit/Config.pm
@@ -3,9 +3,9 @@ package App::Rgit::Config;
 use strict;
 use warnings;
 
-use Carp qw/croak/;
-use Cwd qw/abs_path/;
-use File::Spec::Functions qw/file_name_is_absolute/;
+use Carp       (); # confess
+use Cwd        (); # abs_path
+use File::Spec (); # canonpath
 
 use App::Rgit::Repository;
 use App::Rgit::Utils qw/:levels/;
@@ -46,7 +46,7 @@ sub new {
 
  my $root = $args{root};
  return unless defined $root and -d $root;
- $root = abs_path $root unless file_name_is_absolute $root;
+ $root = File::Spec->canonpath(Cwd::abs_path($root));
 
  my $git = $args{git};
  return unless defined $git;
@@ -58,9 +58,10 @@ sub new {
  } else {
   return unless -x $git;
  }
+ $git = File::Spec->canonpath(Cwd::abs_path($git));
 
  my $conf = 'App::Rgit::Config::Default';
- eval "require $conf; 1" or croak "Couldn't load $conf: $@";
+ eval "require $conf; 1" or Carp::confess("Couldn't load $conf: $@");
 
  my $r = App::Rgit::Repository->new(fake => 1);
  return unless defined $r;
@@ -143,7 +144,7 @@ You can find documentation for this module with the perldoc command.
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2008-2009 Vincent Pit, all rights reserved.
+Copyright 2008,2009,2010 Vincent Pit, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.