r50118 - in /branches/upstream/libconfig-gitlike-perl/current: Changes META.yml SIGNATURE lib/Config/GitLike.pm t/t1300-repo-config.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon Jan 4 01:39:18 UTC 2010
Author: jawnsy-guest
Date: Mon Jan 4 01:39:13 2010
New Revision: 50118
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50118
Log:
[svn-upgrade] Integrating new upstream version, libconfig-gitlike-perl (1.03)
Modified:
branches/upstream/libconfig-gitlike-perl/current/Changes
branches/upstream/libconfig-gitlike-perl/current/META.yml
branches/upstream/libconfig-gitlike-perl/current/SIGNATURE
branches/upstream/libconfig-gitlike-perl/current/lib/Config/GitLike.pm
branches/upstream/libconfig-gitlike-perl/current/t/t1300-repo-config.t
Modified: branches/upstream/libconfig-gitlike-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-gitlike-perl/current/Changes?rev=50118&op=diff
==============================================================================
--- branches/upstream/libconfig-gitlike-perl/current/Changes (original)
+++ branches/upstream/libconfig-gitlike-perl/current/Changes Mon Jan 4 01:39:13 2010
@@ -1,3 +1,12 @@
+1.03 - 2010-01-03
+
+* Filter without replace_all should only replace the _first_ match (alexmv)
+* Having a matching filter with multiple and not replace_all does mean
+ replacement (alexmv)
+* Fix a test that failed because multiple now works, and we're too smart
+ (alexmv)
+* Fix for when ->set_multiple called with no arguments (alexmv)
+
1.02 - 2009-08-19
* Bugfixes and extra tests for escaped \ and " in subsections (sunnavy)
Modified: branches/upstream/libconfig-gitlike-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-gitlike-perl/current/META.yml?rev=50118&op=diff
==============================================================================
--- branches/upstream/libconfig-gitlike-perl/current/META.yml (original)
+++ branches/upstream/libconfig-gitlike-perl/current/META.yml Mon Jan 4 01:39:13 2010
@@ -28,4 +28,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: http://github.com/bestpractical/config-gitlike
-version: 1.02
+version: 1.03
Modified: branches/upstream/libconfig-gitlike-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-gitlike-perl/current/SIGNATURE?rev=50118&op=diff
==============================================================================
--- branches/upstream/libconfig-gitlike-perl/current/SIGNATURE (original)
+++ branches/upstream/libconfig-gitlike-perl/current/SIGNATURE Mon Jan 4 01:39:13 2010
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.55.
+signed via the Module::Signature module, version 0.61.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -14,9 +14,9 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-SHA1 a05fa9b5dd6ec0191e92120a460122e6147a1d40 Changes
+SHA1 2daac330ae24db9a46c2d79a12d66f63c269af71 Changes
SHA1 e64d07b95f1af7d671d5d4a3d5cbe4f204dcc801 MANIFEST
-SHA1 cc5bf5564184ac5b00116299e5cb934e245b7148 META.yml
+SHA1 8c2a9bb6ed304bf00b883bdcd3adbd4e9fef9e74 META.yml
SHA1 652f43d3bb9a33ac5995713dee8716c4d384242f Makefile.PL
SHA1 fd5f3c4f0418efee3b9b16cf8c3902e8374909df inc/Module/Install.pm
SHA1 7cd7c349afdf3f012e475507b1017bdfa796bfbd inc/Module/Install/Base.pm
@@ -26,27 +26,27 @@
SHA1 12bf1867955480d47d5171a9e9c6a96fabe0b58f inc/Module/Install/Metadata.pm
SHA1 f7ee667e878bd2faf22ee9358a7b5a2cc8e91ba4 inc/Module/Install/Win32.pm
SHA1 8ed29d6cf217e0977469575d788599cbfb53a5ca inc/Module/Install/WriteAll.pm
-SHA1 cf876cd40e80990b8829719fe3281b5829b2e2bb lib/Config/GitLike.pm
+SHA1 1cf3f261b0086c2571db24c6045793cc7ef0b45b lib/Config/GitLike.pm
SHA1 9426d508e6841b28449fd5bda97abd1b4f0cbe19 lib/Config/GitLike/Cascaded.pm
SHA1 5444576afe2536921e404e87023181f70f37cc75 lib/Config/GitLike/Git.pm
SHA1 8c30f69743e7a9d743d7206f2306ff9f12bb59a0 t/00_use.t
SHA1 cde69d95c8c39de4f9816b7bfb845b2d96554a7e t/lib/TestConfig.pm
-SHA1 f39867b3d007cc555bd4026aabd6b8345ed1cab4 t/t1300-repo-config.t
+SHA1 7e5420d1d658a8ccced4d55287b454cd8a7fea7f t/t1300-repo-config.t
SHA1 53b21b0f0227909dd299d8adb033f5aff8f5fc42 t/util/translate.pl
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
-iQIcBAEBCAAGBQJKi/TsAAoJEGSVn+mDjfGcpskP+gNnn9TNKO4eppFCXzDHbIC/
-yIynIBf+UauZsrJ0Il8pA/305vj9ZsPgIO/OQ6ySeaoXnVRJgYXkIIOV0pXL0uHS
-VhsN9fJ3huLe3QPUnpyOahUsSRm+TUeO6/6gAe3UNB9aBPC8nh5LYeSUaQyoYHsf
-X2FLS0IKm2WcZ8E8CUw8Ho3DHPeB+gBO3qHgYY/32xIu6su7rdZ95gT+K3RHgvLF
-LWucIhwDJ//L1YNfYK+lGA5TEgKruqbE1e4VeAqNqy490S2DHip96nDG0gHLHlBP
-h2po9WQK+xIl1hxoEQXzx9D3+lnBbb6GXAw/1jX230Fkljo4xCw3kJkth/tUoigN
-hkSw33tiIWnTSEEnqpoCejs/g9K1S4RTPGteczmLQRBQQahj7IJd9RCUtRo5wk+m
-BoTgRAeYs82VhwWy7G98/m5zSd8yQr2/+Jbh3TRZ3gT/UcOziMREgi0GBolWKdoI
-vPoVU+lzBIZ5lQQdOz62NT7ym6aXXRfkHQD0nUpBYf6//CCuGWcqCn1yIxFlq2Fp
-w231GnMRpdE+iYT4DB+bWXB9TWWhkBSDqxaMVQFwT+dsBhAfz2nAXLX5+JBlZADO
-v1hzJb0mSwXuTyBBhRxP08S/cwcaAbEWFa/GoN/tJ2Z/JYt3YZBlQVON/B5/2fxH
-N6sjlNYh4jYvHNQgFLiC
-=08rp
+iQIcBAEBCAAGBQJLQMfUAAoJEGSVn+mDjfGcNaAP+gJzpEZFAwdMFHK3dQkqRLkB
+7uG8ziaAiGSpjCDHmwRp8x/iHnqPTK6UZpIb6ZgUuzOhu1am/egjzhgW4GeDfQRx
+Gv8V0EXoctmvVD90b8G1LJRcyd1oVvHqJdhyemgmKVO5/w5LzFZmLHbtRJccN1wR
++7K7+gxKa2z30ck3ex0KSv3ifVKAkINOaFwAqrfwwVoF+p5EVCMReoofG8jNycwE
+7xhkehWQPOZEnz5NhGqFcSiF1ixpB23mQavL8UJiPdDZCrlOVGnRPMVQGevLK3ZC
+vyVlvGOc0LJJzIhFDWiMlJ/dittf/0EY5oXesmZp+HOlJCx3y8lhIF7sP+PqCYsi
+7Hdk383mvCTWekw8w7vY0KJEfCfYyCZuKfgATRZZBaeFFR57uW/Wd0bj3QPGKDxX
+LYnNrbJ2pPdIVUv47p6EFBqDrFiElbV9Ov0fiZEPXKcyUUI3tQs++CVDHxZdy0oH
+mQaqkJ4zlbr249sozVoUztN9dRflTIg+jYH3QCUhHTmsiLPpYBJi12FRgSDYpZs1
+pt2Q9Yi9+R26UuYkykVqbmoL3mvP8BQISEM8QspYTVsA44P0VlijsSIdx9IyDAOu
+BTzfQc0HuaVUJp81SkRt0us9d0Y0tyOieci+HftFCW0WyD0VKEfHWS2CUtRSbOus
+fkZS2Oxqu4tULAtAJgec
+=ylIC
-----END PGP SIGNATURE-----
Modified: branches/upstream/libconfig-gitlike-perl/current/lib/Config/GitLike.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-gitlike-perl/current/lib/Config/GitLike.pm?rev=50118&op=diff
==============================================================================
--- branches/upstream/libconfig-gitlike-perl/current/lib/Config/GitLike.pm (original)
+++ branches/upstream/libconfig-gitlike-perl/current/lib/Config/GitLike.pm Mon Jan 4 01:39:13 2010
@@ -7,7 +7,7 @@
use Fcntl qw(O_CREAT O_EXCL O_WRONLY);
use 5.008;
-our $VERSION = '1.02';
+our $VERSION = '1.03';
has 'confname' => (
@@ -54,7 +54,7 @@
sub set_multiple {
my $self = shift;
- my ($name, $mult) = @_, 1;
+ my ($name, $mult) = (@_, 1);
$self->multiple->{$name} = $mult;
}
@@ -794,9 +794,13 @@
die "Multiple occurrences of non-multiple key?"
if @replace > 1 && !$args{multiple};
+ # We're only replacing the first occurrance unless they said
+ # to replace them all.
+ @replace = ($replace[0]) if @replace and $args{value} and not $args{replace_all};
+
if (defined $args{value}) {
if (@replace
- && (!$args{multiple} || $args{replace_all})) {
+ && (!$args{multiple} || $args{filter} || $args{replace_all})) {
# Replacing existing value(s)
# if the string we're replacing with is not the same length as
Modified: branches/upstream/libconfig-gitlike-perl/current/t/t1300-repo-config.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-gitlike-perl/current/t/t1300-repo-config.t?rev=50118&op=diff
==============================================================================
--- branches/upstream/libconfig-gitlike-perl/current/t/t1300-repo-config.t (original)
+++ branches/upstream/libconfig-gitlike-perl/current/t/t1300-repo-config.t Mon Jan 4 01:39:13 2010
@@ -339,7 +339,7 @@
$config->set(
key => 'nextsection.nonewline',
value => 'wow3',
- filter => qr/wow$/,
+ filter => qr/wow/,
filename => $config_filename
);
@@ -353,14 +353,14 @@
NoNewLine = wow2 for me
EOF
;
-
-is( slurp($config_filename), $expect, 'multivar replace' );
+is( slurp($config_filename), $expect, 'multivar replace only the first match' );
$config->load;
throws_ok {
$config->set(
key => 'nextsection.nonewline',
- filename => $config_filename
+ filename => $config_filename,
+ multiple => 0, # Otherwise we Do The Right Thing, as we know it's multiple
);
}
qr/Multiple occurrences of non-multiple key/i, 'ambiguous unset';
More information about the Pkg-perl-cvs-commits
mailing list