Hello community,
here is the log from the commit of package perl-App-cpanminus for
openSUSE:Factory checked in at 2015-05-10 10:47:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-App-cpanminus (Old)
and /work/SRC/openSUSE:Factory/.perl-App-cpanminus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-App-cpanminus"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-App-cpanminus/perl-App-cpanminus.changes
2015-05-02 16:16:18.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-App-cpanminus.new/perl-App-cpanminus.changes
2015-05-10 10:47:14.000000000 +0200
@@ -1,0 +2,11 @@
+Fri May 8 08:09:51 UTC 2015 - [email protected]
+
+- updated to 1.7034
+ see /usr/share/doc/packages/perl-App-cpanminus/Changes
+
+ 1.7034 2015-05-07 14:20:57 PDT
+ [Improvements]
+ - Improved an error message when dependency requirement in cpanfile
get conflict with prereqs
+ in sub dependencies.
+
+-------------------------------------------------------------------
Old:
----
App-cpanminus-1.7033.tar.gz
New:
----
App-cpanminus-1.7034.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-App-cpanminus.spec ++++++
--- /var/tmp/diff_new_pack.BevEn9/_old 2015-05-10 10:47:14.000000000 +0200
+++ /var/tmp/diff_new_pack.BevEn9/_new 2015-05-10 10:47:14.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-App-cpanminus
-Version: 1.7033
+Version: 1.7034
Release: 0
%define cpan_name App-cpanminus
Summary: Get, Unpack, Build and Install Modules From Cpan
++++++ App-cpanminus-1.7033.tar.gz -> App-cpanminus-1.7034.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/App-cpanminus-1.7033/Changes
new/App-cpanminus-1.7034/Changes
--- old/App-cpanminus-1.7033/Changes 2015-05-02 02:17:48.000000000 +0200
+++ new/App-cpanminus-1.7034/Changes 2015-05-07 23:21:01.000000000 +0200
@@ -1,5 +1,10 @@
See http://github.com/miyagawa/cpanminus/ for the latest development.
+1.7034 2015-05-07 14:20:57 PDT
+ [Improvements]
+ - Improved an error message when dependency requirement in cpanfile get
conflict with prereqs
+ in sub dependencies.
+
1.7033 2015-05-01 17:17:42 PDT
[Improvements]
- Remove MakeMaker and Module::Build from cpanm's runtime dependencies.
Rather it will upgrade
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/App-cpanminus-1.7033/META.json
new/App-cpanminus-1.7034/META.json
--- old/App-cpanminus-1.7033/META.json 2015-05-02 02:17:48.000000000 +0200
+++ new/App-cpanminus-1.7034/META.json 2015-05-07 23:21:01.000000000 +0200
@@ -101,7 +101,7 @@
"web" : "https://github.com/miyagawa/cpanminus";
}
},
- "version" : "1.7033",
+ "version" : "1.7034",
"x_contributors" : [
"Alessandro Ghedini <[email protected]>",
"Andrew Rodland <[email protected]>",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/App-cpanminus-1.7033/META.yml
new/App-cpanminus-1.7034/META.yml
--- old/App-cpanminus-1.7033/META.yml 2015-05-02 02:17:48.000000000 +0200
+++ new/App-cpanminus-1.7034/META.yml 2015-05-07 23:21:01.000000000 +0200
@@ -29,7 +29,7 @@
bugtracker: https://github.com/miyagawa/cpanminus/issues
homepage: https://github.com/miyagawa/cpanminus
repository: https://github.com/miyagawa/cpanminus.git
-version: '1.7033'
+version: '1.7034'
x_contributors:
- 'Alessandro Ghedini <[email protected]>'
- 'Andrew Rodland <[email protected]>'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/App-cpanminus-1.7033/Makefile.PL
new/App-cpanminus-1.7034/Makefile.PL
--- old/App-cpanminus-1.7033/Makefile.PL 2015-05-02 02:17:48.000000000
+0200
+++ new/App-cpanminus-1.7034/Makefile.PL 2015-05-07 23:21:01.000000000
+0200
@@ -23,7 +23,7 @@
"TEST_REQUIRES" => {
"Test::More" => 0
},
- "VERSION" => "1.7033",
+ "VERSION" => "1.7034",
"test" => {
"TESTS" => "t/*.t"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/App-cpanminus-1.7033/bin/cpanm
new/App-cpanminus-1.7034/bin/cpanm
--- old/App-cpanminus-1.7033/bin/cpanm 2015-05-02 02:17:48.000000000 +0200
+++ new/App-cpanminus-1.7034/bin/cpanm 2015-05-07 23:21:01.000000000 +0200
@@ -21,11 +21,11 @@
my %fatpacked;
$fatpacked{"App/cpanminus.pm"} = '#line '.(1+__LINE__).'
"'.__FILE__."\"\n".<<'APP_CPANMINUS';
- package App::cpanminus;our$VERSION="1.7033";1;
+ package App::cpanminus;our$VERSION="1.7034";1;
APP_CPANMINUS
$fatpacked{"App/cpanminus/Dependency.pm"} = '#line '.(1+__LINE__).'
"'.__FILE__."\"\n".<<'APP_CPANMINUS_DEPENDENCY';
- package App::cpanminus::Dependency;use strict;use
CPAN::Meta::Requirements;sub from_prereqs
{my($class,$prereqs,$phases,$types)=@_;my@deps;for my$type
(@$types){push@deps,$class->from_versions($prereqs->merged_requirements($phases,[$type])->as_string_hash,$type,)}return@deps}sub
from_versions {my($class,$versions,$type)=@_;my@deps;while
(my($module,$version)=each
%$versions){push@deps,$class->new($module,$version,$type)}@deps}sub merge_with
{my($self,$requirements)=@_;$self->{original_version}=$self->version;$requirements->add_string_requirement($self->module,$self->version);$self->{version}=$requirements->requirements_for_module($self->module)}sub
new {my($class,$module,$version,$type)=@_;bless
{module=>$module,version=>$version,type=>$type || 'requires',},$class}sub
module {$_[0]->{module}}sub version {$_[0]->{version}}sub type
{$_[0]->{type}}sub requires_version {my$self=shift;if
(defined$self->{original_version}){return$self->{original_version}}$self->version}sub
is_requirement {$_[0]->{type}eq 'requires'}1;
+ package App::cpanminus::Dependency;use strict;use
CPAN::Meta::Requirements;sub from_prereqs
{my($class,$prereqs,$phases,$types)=@_;my@deps;for my$type
(@$types){push@deps,$class->from_versions($prereqs->merged_requirements($phases,[$type])->as_string_hash,$type,)}return@deps}sub
from_versions {my($class,$versions,$type)=@_;my@deps;while
(my($module,$version)=each
%$versions){push@deps,$class->new($module,$version,$type)}@deps}sub merge_with
{my($self,$requirements)=@_;$self->{original_version}=$self->version;eval
{$requirements->add_string_requirement($self->module,$self->version)};if ($@ =~
/illegal requirements/){warn sprintf("Can't merge requirements for %s: '%s' and
'%s'",$self->module,$self->version,$requirements->requirements_for_module($self->module))}$self->{version}=$requirements->requirements_for_module($self->module)}sub
new {my($class,$module,$version,$type)=@_;bless
{module=>$module,version=>$version,type=>$type || 'requires',},$class}sub
module {$_[0]->{module}}sub version {$_[0]->{version}}sub type
{$_[0]->{type}}sub requires_version {my$self=shift;if
(defined$self->{original_version}){return$self->{original_version}}$self->version}sub
is_requirement {$_[0]->{type}eq 'requires'}1;
APP_CPANMINUS_DEPENDENCY
$fatpacked{"App/cpanminus/script.pm"} = '#line '.(1+__LINE__).'
"'.__FILE__."\"\n".<<'APP_CPANMINUS_SCRIPT';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/App-cpanminus-1.7033/lib/App/cpanminus/fatscript.pm
new/App-cpanminus-1.7034/lib/App/cpanminus/fatscript.pm
--- old/App-cpanminus-1.7033/lib/App/cpanminus/fatscript.pm 2015-05-02
02:17:48.000000000 +0200
+++ new/App-cpanminus-1.7034/lib/App/cpanminus/fatscript.pm 2015-05-07
23:21:01.000000000 +0200
@@ -22,7 +22,7 @@
$fatpacked{"App/cpanminus.pm"} = '#line '.(1+__LINE__).'
"'.__FILE__."\"\n".<<'APP_CPANMINUS';
package App::cpanminus;
- our $VERSION = "1.7033";
+ our $VERSION = "1.7034";
=encoding utf8
@@ -343,7 +343,17 @@
$self->{original_version} = $self->version;
# should it clone? not cloning means we upgrade root $requirements on
our way
- $requirements->add_string_requirement($self->module, $self->version);
+ eval {
+ $requirements->add_string_requirement($self->module, $self->version);
+ };
+ if ($@ =~ /illegal requirements/) {
+ # Just give a warning then replace with the root requirements
+ # so that later CPAN::Meta::Check can give a valid error
+ warn sprintf("Can't merge requirements for %s: '%s' and '%s'",
+ $self->module, $self->version,
+ $requirements->requirements_for_module($self->module));
+ }
+
$self->{version} = $requirements->requirements_for_module($self->module);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/App-cpanminus-1.7033/lib/App/cpanminus.pm
new/App-cpanminus-1.7034/lib/App/cpanminus.pm
--- old/App-cpanminus-1.7033/lib/App/cpanminus.pm 2015-05-02
02:17:48.000000000 +0200
+++ new/App-cpanminus-1.7034/lib/App/cpanminus.pm 2015-05-07
23:21:01.000000000 +0200
@@ -1,5 +1,5 @@
package App::cpanminus;
-our $VERSION = "1.7033";
+our $VERSION = "1.7034";
=encoding utf8
