dinislage/cpanspec
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try $] as-is and numeric when we use it with Module::CoreList.

Browse Source
This commit is contained in:
stevenpritchard committed 2008-05-05 20:17:50 +00:00
1 parent 47a5b7878e
commit f4424d02d1
2 files changed
+11 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Changes
+1 -1
View File
@@ -1,6 +1,6 @@
1.75 1.75
* Make sure $] is numeric before we use it with Module::CoreList. * Try $] as-is and numeric when we use it with Module::CoreList.
* Switch from wget to curl in cpanget since wget is broken in Fedora 9. * Switch from wget to curl in cpanget since wget is broken in Fedora 9.
* The best README is probably the one with the shortest filename. * The best README is probably the one with the shortest filename.
cpanspec
+10 -6
View File
@@ -10,7 +10,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# $Id: cpanspec,v 1.59 2008/05/05 18:39:21 stevenpritchard Exp $ # $Id: cpanspec,v 1.60 2008/05/05 20:17:50 stevenpritchard Exp $
our $NAME="cpanspec"; our $NAME="cpanspec";
our $VERSION='1.75'; our $VERSION='1.75';
@@ -561,10 +561,14 @@ if (!$packager or $packager eq "\%packager") {
. " Please add or use --packager option.\n"; . " Please add or use --packager option.\n";
} }
my $perl_version=$]+0; my $perl_version=$];
die "Module::CoreList does not support perl version $perl_version!\n" if (!exists($Module::CoreList::version{$perl_version})) {
if (!exists($Module::CoreList::version{$perl_version})); $perl_version+=0;
if (!exists($Module::CoreList::version{$perl_version})) {
die "Module::CoreList does not support perl version $perl_version!\n";
}
}
my @args=@ARGV; my @args=@ARGV;
my @processed=(); my @processed=();
@@ -969,7 +973,7 @@ END
} }
for my $dep (sort(keys(%build_requires))) { for my $dep (sort(keys(%build_requires))) {
if (exists($Module::CoreList::version{$]}{$dep})) { if (exists($Module::CoreList::version{$perl_version}{$dep})) {
next if (!$compat and $dep ne "ExtUtils::MakeMaker"); next if (!$compat and $dep ne "ExtUtils::MakeMaker");
} elsif ($follow) { } elsif ($follow) {
if ($dep ne $module and !(grep { $_ eq $dep } @processed, @args)) { if ($dep ne $module and !(grep { $_ eq $dep } @processed, @args)) {
@@ -992,7 +996,7 @@ END
} }
for my $dep (sort(keys(%requires))) { for my $dep (sort(keys(%requires))) {
next if (!$compat and exists($Module::CoreList::version{$]}{$dep})); next if (!$compat and exists($Module::CoreList::version{$perl_version}{$dep}));
printf $spec "%-16s%s", "Requires:", "perl($dep)"; printf $spec "%-16s%s", "Requires:", "perl($dep)";
print $spec (" >= " . $requires{$dep}) if ($requires{$dep}); print $spec (" >= " . $requires{$dep}) if ($requires{$dep});
print $spec "\n"; print $spec "\n";