Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into leo/gh_issues
  • Loading branch information
ranguard committed Mar 8, 2016
2 parents 541c0d9 + 2b8dbec commit 498fb5d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
3 changes: 2 additions & 1 deletion lib/MetaCPAN/Document/File.pm
Expand Up @@ -265,7 +265,8 @@ has documentation => (
sub _build_documentation {
my $self = shift;
$self->_build_abstract;
my $documentation = $self->documentation if ( $self->has_documentation );
my $documentation
= $self->has_documentation ? $self->documentation : undef;
return undef unless ( ${ $self->pod } );
my @indexed = grep { $_->indexed } @{ $self->module || [] };
if ( $documentation && $self->is_pod_file ) {
Expand Down
4 changes: 1 addition & 3 deletions lib/MetaCPAN/Script/Release.pm
Expand Up @@ -143,14 +143,12 @@ sub run {
$self->perms;
my @pid;

# FIXME: What is this supposed to do? Don't do 'my' in a condition.
my $cpan = $self->index if ( $self->skip );
eval { DB::enable_profile() };
while ( my $file = shift @files ) {

if ( $self->skip ) {
my $d = CPAN::DistnameInfo->new($file);
my $count = $cpan->type('release')->filter(
my $count = $self->index->type('release')->filter(
{
and => [
{ term => { archive => $d->filename } },
Expand Down
6 changes: 2 additions & 4 deletions t/release/weblint++-1.15.t
Expand Up @@ -28,10 +28,8 @@ test_release(
my ($self) = @_;

{
local $TODO
= 'Should we be stripping the ++ from the distribution?';
is $self->data->distribution, 'weblint++',
'distribution matches META name';
is $self->data->distribution, 'weblint',
'distribution matches META name, but strips out ++';
}
},
}
Expand Down

0 comments on commit 498fb5d

Please sign in to comment.