commit perl-Config-Any for openSUSE:Factory

30 Apr 2015

Hello community,

here is the log from the commit of package perl-Config-Any for openSUSE:Factory checked in at 2015-04-30 11:51:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Config-Any (Old)
 and      /work/SRC/openSUSE:Factory/.perl-Config-Any.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "perl-Config-Any"

Changes:
--------

--- /work/SRC/openSUSE:Factory/perl-Config-Any/perl-Config-Any.changes	2015-04-27 13:04:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Config-Any.new/perl-Config-Any.changes	2015-04-30 11:51:34.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Apr 30 05:45:15 UTC 2015 - coolo@suse.com
+
+- updated to 0.26
+   see /usr/share/doc/packages/perl-Config-Any/Changes
+
+  0.26 2015-04-29
+      - fix error reporting from code applied in 0.25 (RT #104079)
+
+-------------------------------------------------------------------

Old:
----
  Config-Any-0.25.tar.gz

New:
----
  Config-Any-0.26.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Config-Any.spec ++++++
--- /var/tmp/diff_new_pack.FNbcpr/_old	2015-04-30 11:51:35.000000000 +0200
+++ /var/tmp/diff_new_pack.FNbcpr/_new	2015-04-30 11:51:35.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           perl-Config-Any
-Version:        0.25
+Version:        0.26
 Release:        0
 %define cpan_name Config-Any
 Summary:        Load configuration from different file formats, transparently

++++++ Config-Any-0.25.tar.gz -> Config-Any-0.26.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/Changes new/Config-Any-0.26/Changes
--- old/Config-Any-0.25/Changes	2015-04-24 03:33:10.000000000 +0200
+++ new/Config-Any-0.26/Changes	2015-04-30 01:04:47.000000000 +0200
@@ -1,5 +1,8 @@
 Revision history for Config-Any
 
+0.26 2015-04-29
+    - fix error reporting from code applied in 0.25 (RT #104079)
+
 0.25 2015-04-23
     - do not clobber $@ (RT #103061)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/META.yml new/Config-Any-0.26/META.yml
--- old/Config-Any-0.25/META.yml	2015-04-24 03:38:18.000000000 +0200
+++ new/Config-Any-0.26/META.yml	2015-04-30 01:07:42.000000000 +0200
@@ -25,4 +25,4 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://git.shadowcat.co.uk/p5sagit/Config-Any.git
-version: 0.25
+version: 0.26
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/lib/Config/Any.pm new/Config-Any-0.26/lib/Config/Any.pm
--- old/Config-Any-0.25/lib/Config/Any.pm	2015-04-24 03:33:19.000000000 +0200
+++ new/Config-Any-0.26/lib/Config/Any.pm	2015-04-30 01:05:15.000000000 +0200
@@ -6,7 +6,7 @@
 use Carp;
 use Module::Pluggable::Object ();
 
-our $VERSION = '0.25';
+our $VERSION = '0.26';
 
 =head1 NAME
 
@@ -195,15 +195,15 @@
             next unless $loader->is_supported;
             $supported = 1;
             my @configs;
-            my $ok = do {
+            my $err = do {
                 local $@;
                 @configs = eval { $loader->load( $filename, $loader_args{ $loader } ); };
-                1;
+                $@;
             };
 
             # fatal error if we used extension matching
-            croak "Error parsing $filename: $@" if !$ok and $use_ext_lut;
-            next if !$ok or !@configs;
+            croak "Error parsing $filename: $err" if $err and $use_ext_lut;
+            next if $err or !@configs;
 
             # post-process config with a filter callback
             if ( $args->{ filter } ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/t/50-general.t new/Config-Any-0.26/t/50-general.t
--- old/Config-Any-0.25/t/50-general.t	2013-08-15 03:12:36.000000000 +0200
+++ new/Config-Any-0.26/t/50-general.t	2015-04-30 01:03:29.000000000 +0200
@@ -2,13 +2,14 @@
 use warnings;
 
 use Test::More;
+use Config::Any;
 use Config::Any::General;
 
 if ( !Config::Any::General->is_supported ) {
     plan skip_all => 'Config::General format not supported';
 }
 else {
-    plan tests => 7;
+    plan tests => 9;
 }
 
 {
@@ -37,4 +38,13 @@
 
     ok( !$config, 'config load failed' );
     ok( $@,       "error thrown ($@)" );
+}
+
+# parse error generated on invalid config
+{
+    my $file = 't/invalid/conf.conf';
+    my $config = eval { Config::Any->load_files( { files => [$file], use_ext => 1} ) };
+
+    ok( !$config, 'config load failed' );
+    ok( $@,       "error thrown ($@)" );
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/t/51-ini.t new/Config-Any-0.26/t/51-ini.t
--- old/Config-Any-0.25/t/51-ini.t	2013-08-15 03:12:36.000000000 +0200
+++ new/Config-Any-0.26/t/51-ini.t	2015-04-30 01:03:29.000000000 +0200
@@ -2,13 +2,14 @@
 use warnings;
 
 use Test::More;
+use Config::Any;
 use Config::Any::INI;
 
 if ( !Config::Any::INI->is_supported ) {
     plan skip_all => 'INI format not supported';
 }
 else {
-    plan tests => 13;
+    plan tests => 15;
 }
 
 {
@@ -54,4 +55,13 @@
 
     ok( !$config, 'config load failed' );
     ok( $@,       "error thrown ($@)" );
+}
+
+# parse error generated on invalid config
+{
+    my $file = 't/invalid/conf.ini';
+    my $config = eval { Config::Any->load_files( { files => [$file], use_ext => 1} ) };
+
+    ok( !$config, 'config load failed' );
+    ok( $@,       "error thrown ($@)" );
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/t/52-json.t new/Config-Any-0.26/t/52-json.t
--- old/Config-Any-0.25/t/52-json.t	2013-08-15 03:12:36.000000000 +0200
+++ new/Config-Any-0.26/t/52-json.t	2015-04-30 01:03:29.000000000 +0200
@@ -2,13 +2,14 @@
 use warnings;
 
 use Test::More;
+use Config::Any;
 use Config::Any::JSON;
 
 if ( !Config::Any::JSON->is_supported ) {
     plan skip_all => 'JSON format not supported';
 }
 else {
-    plan tests => 4;
+    plan tests => 6;
 }
 
 {
@@ -24,4 +25,13 @@
 
     ok( !$config, 'config load failed' );
     ok( $@,       "error thrown ($@)" );
+}
+
+# parse error generated on invalid config
+{
+    my $file = 't/invalid/conf.json';
+    my $config = eval { Config::Any->load_files( { files => [$file], use_ext => 1} ) };
+
+    ok( !$config, 'config load failed' );
+    ok( $@,       "error thrown ($@)" );
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/t/53-perl.t new/Config-Any-0.26/t/53-perl.t
--- old/Config-Any-0.25/t/53-perl.t	2013-08-15 03:12:36.000000000 +0200
+++ new/Config-Any-0.26/t/53-perl.t	2015-04-30 01:03:29.000000000 +0200
@@ -1,8 +1,8 @@
 use strict;
 use warnings;
 
-use Test::More tests => 5;
-
+use Test::More tests => 7;
+use Config::Any;
 use Config::Any::Perl;
 
 {
@@ -23,4 +23,13 @@
 
     ok( !$config, 'config load failed' );
     ok( $@,       "error thrown ($@)" );
+}
+
+# parse error generated on invalid config
+{
+    my $file = 't/invalid/conf.pl';
+    my $config = eval { Config::Any->load_files( { files => [$file], use_ext => 1} ) };
+
+    ok( !$config, 'config load failed' );
+    ok( $@,       "error thrown ($@)" );
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/t/54-xml.t new/Config-Any-0.26/t/54-xml.t
--- old/Config-Any-0.25/t/54-xml.t	2013-08-15 03:12:36.000000000 +0200
+++ new/Config-Any-0.26/t/54-xml.t	2015-04-30 01:03:29.000000000 +0200
@@ -2,13 +2,14 @@
 use warnings;
 
 use Test::More;
+use Config::Any;
 use Config::Any::XML;
 
 if ( !Config::Any::XML->is_supported ) {
     plan skip_all => 'XML format not supported';
 }
 else {
-    plan tests => 6;
+    plan tests => 8;
 }
 
 {
@@ -39,3 +40,13 @@
     ok( $config, 'config loaded' );
     ok( !$@,     'no error thrown' );
 }
+
+# parse error generated on invalid config
+{
+    my $file = 't/invalid/conf.xml';
+    my $config = eval { Config::Any->load_files( { files => [$file], use_ext => 1} ) };
+
+    ok( !$config, 'config load failed' );
+    ok( $@,       "error thrown ($@)" );
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-Any-0.25/t/55-yaml.t new/Config-Any-0.26/t/55-yaml.t
--- old/Config-Any-0.25/t/55-yaml.t	2013-09-10 20:41:34.000000000 +0200
+++ new/Config-Any-0.26/t/55-yaml.t	2015-04-30 01:03:29.000000000 +0200
@@ -3,13 +3,14 @@
 no warnings 'once';
 
 use Test::More;
+use Config::Any;
 use Config::Any::YAML;
 
 if ( !Config::Any::YAML->is_supported ) {
     plan skip_all => 'YAML format not supported';
 }
 else {
-    plan tests => 4;
+    plan tests => 6;
 }
 
 {
@@ -25,4 +26,13 @@
 
     ok( !$config, 'config load failed' );
     ok( $@,       "error thrown ($@)" );
+}
+
+# parse error generated on invalid config
+{
+    my $file = 't/invalid/conf.yml';
+    my $config = eval { Config::Any->load_files( { files => [$file], use_ext => 1} ) };
+
+    ok( !$config, 'config load failed' );
+    ok( $@,       "error thrown ($@)" );
 }

    

root＠hilbert.suse.de

tags

participants (1)