[svn:p5ee] r12180 - in p5ee/trunk/App-Options: . lib/App

Author: spadkins
Date: Wed Dec 17 10:30:42 2008
New Revision: 12180

Modified:
   p5ee/trunk/App-Options/CHANGES
   p5ee/trunk/App-Options/lib/App/Options.pm

Log:
freeze for 1.06

Modified: p5ee/trunk/App-Options/CHANGES
==============================================================================
--- p5ee/trunk/App-Options/CHANGES	(original)
+++ p5ee/trunk/App-Options/CHANGES	Wed Dec 17 10:30:42 2008
@@ -2,6 +2,9 @@
 # CHANGE LOG
 #############################################################################
 
+VERSION 1.06
+ x Remove trailing \r from option files (for Windows-edited .conf files)
+
 VERSION 1.05
  x Substitutions of ${prefix} in option files now works even if only defined by assumption
    This is particularly valuable for portability between environments of CGI scripts and cron scripts.

Modified: p5ee/trunk/App-Options/lib/App/Options.pm
==============================================================================
--- p5ee/trunk/App-Options/lib/App/Options.pm	(original)
+++ p5ee/trunk/App-Options/lib/App/Options.pm	Wed Dec 17 10:30:42 2008
@@ -14,7 +14,7 @@
 use File::Spec;
 use Config;
 
-$VERSION = "1.05";
+$VERSION = "1.06";
 
 =head1 NAME
 
@@ -1041,6 +1041,7 @@
             my ($orig_line);
             while (<App::Options::FILE>) {
                 chomp;
+                s/\r$//;   # remove final CR (for Windows files)
                 $orig_line = $_;
                 # for lines that are like "[regexp]" or even "[regexp] var = value"
                 # or "[value;var=value]" or "[/regexp/;var1=value1;var2=/regexp2/]"