scip/Config-General
1
0
Fork 0
mirror of https://codeberg.org/scip/Config-General.git synced 2025-12-16 20:21:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

2.17

Browse Source 
- added File::Spec support which makes the modules more portable
	   (i.e. on win32 systems),
	   as suggested by Peter Tandler <Peter.Tandler@ipsi.fhg.de>.


git-svn-id: http://dev.catalyst.perl.org/repos/Config-General/trunk@43 be1acefe-a474-0410-9a34-9b3221f2030f
This commit is contained in:
Thomas von Dein
2009-10-10 16:27:14 +00:00
parent 4575d2a052
commit 2402b0bb7b
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog
View File

@@ -1,3 +1,8 @@
2.17
- added File::Spec support which makes the modules more portable
(i.e. on win32 systems),
as suggested by Peter Tandler <Peter.Tandler@ipsi.fhg.de>.
2.16
- applied patch by Michael Gray <mjg17@eng.cam.ac.uk> which
fixes a bug in the Interpolate.pm submodule. A second variable,

19
General.pm
View File

@@ -13,11 +13,12 @@
package Config::General;
use FileHandle;
use File::Spec::Functions;
use strict;
use Carp;
use Exporter;
$Config::General::VERSION = "2.16";
$Config::General::VERSION = "2.17";
use vars qw(@ISA @EXPORT);
@ISA = qw(Exporter);
@@ -227,8 +228,12 @@ sub new {
if ($self->{ConfigFile}) {
# open the file and read the contents in
$self->{configfile} = $self->{ConfigFile};
# look if is is an absolute path and save the basename if it is absolute
($self->{configpath}) = $self->{ConfigFile} =~ /^(\/.*)\//;
if ( file_name_is_absolute($self->{ConfigFile}) ) {
# look if is is an absolute path and save the basename if it is absolute
my ($dummi, $path, $dummi) = splitpath($self->{ConfigFile});
$path =~ s#/$##; # remove eventually existing trailing slash
$self->{configpath} = $path;
}
$self->_open($self->{configfile});
# now, we parse immdediately, getall simply returns the whole hash
$self->{config} = $self->_parse($self->{DefaultConfig}, $self->{content});
@@ -429,9 +434,9 @@ sub _read {
my $incl_file;
if (/^\s*<<include\s+(.+?)>>\s*$/i || (/^\s*include\s+(.+?)\s*$/i && $this->{UseApacheInclude})) {
$incl_file = $1;
if ($this->{IncludeRelative} && $this->{configpath} && $incl_file !~ /^\//) {
if ( $this->{IncludeRelative} && $this->{configpath} && !file_name_is_absolute($incl_file) ) {
# include the file from within location of $this->{configfile}
$this->_open($this->{configpath} . "/" . $incl_file);
$this->_open( catfile($this->{configpath}, $incl_file) );
}
else {
# include the file from within pwd, or absolute
@@ -1783,7 +1788,7 @@ I recommend you to read the following documentations, which are supplied with pe
=head1 COPYRIGHT
Copyright (c) 2000-2002 Thomas Linden
Copyright (c) 2000-2003 Thomas Linden
This library is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
@@ -1800,7 +1805,7 @@ Thomas Linden <tom@daemon.de>
=head1 VERSION
2.16
2.17
=cut

2
README
View File

@@ -104,4 +104,4 @@ AUTHOR
VERSION
2.16
2.17