[OPEN-ILS-DEV] PATCH: Config.pm: trim whitespace from the end of bootstrap.conf lines

[Dan Scott]

A few people have already been bitten by insidious whitespace
appearing at the end of lines in bootstrap.conf, so I decided to throw
away any EOL whitespace when the file is parsed with a simple change
to the pertinent regex.

Tested with an altered bootstrap.conf that contained tabs and spaces
after passwd and various other keys; old version of Config.pm
eventually choked with a SettingsParser.pm error on startup, while the
new version carried on smoothly.

Also updated the copyright date to 2007 and updated Mike's email
address to something more recent :)

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I have
the right to submit it under the open source license indicated in the
file; or
(b) The contribution is based upon previous work that, to the best of
my knowledge, is covered under an appropriate open source license and
I have the right under that license to submit that work with
modifications, whether created in whole or in part by me, under the
same open source license (unless I am permitted to submit under a
different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person
who certified (a), (b) or (c) and I have not modified it; and
(d) In the case of each of (a), (b), or (c), I understand and agree
that this project and the contribution are public and that a record of
the contribution (including all personal information I submit with it,
including my sign-off) is maintained indefinitely and may be
redistributed consistent with this project or the open source license
indicated in the file.

-- 
Dan Scott
Laurentian University
-------------- next part --------------
Index: OpenSRF/src/perlmods/OpenSRF/Utils/Config.pm
===================================================================
RCS file: /cvs/ILS/OpenSRF/src/perlmods/OpenSRF/Utils/Config.pm,v
retrieving revision 1.5
diff -c -r1.5 Config.pm
*** OpenSRF/src/perlmods/OpenSRF/Utils/Config.pm	22 Mar 2007 19:49:08 -0000	1.5
--- OpenSRF/src/perlmods/OpenSRF/Utils/Config.pm	23 May 2007 00:38:54 -0000
***************
*** 40,46 ****
  		}
  
  		my ($protokey,$value,$keytype,$key);
! 		if ($line =~ /^([^=\s]+)\s*=\s*(.*)/s) {
  			($protokey,$value) = ($1,$2);
  			($keytype,$key) = split(/:/,$protokey);
  		}
--- 40,46 ----
  		}
  
  		my ($protokey,$value,$keytype,$key);
! 		if ($line =~ /^([^=\s]+)\s*=\s*(.*?)\s*$/s) {
  			($protokey,$value) = ($1,$2);
  			($keytype,$key) = split(/:/,$protokey);
  		}
***************
*** 421,431 ****
  
  =head1 BUGS
  
! No know bugs, but report any to miker at purplefrog.com.
  
  =head1 COPYRIGHT AND LICENSING
  
! Mike Rylander, Copyright 2000-2004
  
  The OpenSRF::Utils::Config module is free software. You may distribute under the terms
  of the GNU General Public License version 2 or greater.
--- 421,431 ----
  
  =head1 BUGS
  
! No known bugs, but report any to mrylander at gmail.com.
  
  =head1 COPYRIGHT AND LICENSING
  
! Mike Rylander, Copyright 2000-2007
  
  The OpenSRF::Utils::Config module is free software. You may distribute under the terms
  of the GNU General Public License version 2 or greater.