r25678 - in /branches/upstream/libpar-dist-perl/current: Changes META.yml lib/PAR/Dist.pm

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Sep 26 20:58:54 2008
New Revision: 25678

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25678
Log:
[svn-upgrade] Integrating new upstream version, libpar-dist-perl (0.34)

Modified:
    branches/upstream/libpar-dist-perl/current/Changes
    branches/upstream/libpar-dist-perl/current/META.yml
    branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm

Modified: branches/upstream/libpar-dist-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-dist-perl/current/Changes?rev=25678&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/Changes (original)
+++ branches/upstream/libpar-dist-perl/current/Changes Fri Sep 26 20:58:54 2008
@@ -1,3 +1,12 @@
+By: smueller on 2008/09/24
+    * Do not fail if _zip() doesn't return true, doh!
+    * This is 0.34.
+____________________________________________________________________________
+By: smueller on 2008/09/17
+    * Better diagnostics for the CPAN testers test failures.
+    * Extra -f check in _merge_meta.
+    * This is 0.33.
+____________________________________________________________________________
 By: smueller on 2008/09/12
     * Version bump, fix tests.
     * This is 0.32.

Modified: branches/upstream/libpar-dist-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-dist-perl/current/META.yml?rev=25678&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/META.yml (original)
+++ branches/upstream/libpar-dist-perl/current/META.yml Fri Sep 26 20:58:54 2008
@@ -1,11 +1,11 @@
 --- #YAML:1.0
 name:                PAR-Dist
-version:             0.32
+version:             0.34
 abstract:            Create and manipulate PAR distributions
 license:             ~
 author:              
     - Audrey Tang <cpan at audreyt.org>
-generated_by:        ExtUtils::MakeMaker version 6.44
+generated_by:        ExtUtils::MakeMaker version 6.42
 distribution_type:   module
 requires:     
     File::Find:                    0

Modified: branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm?rev=25678&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm (original)
+++ branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm Fri Sep 26 20:58:54 2008
@@ -2,7 +2,7 @@
 require Exporter;
 use vars qw/$VERSION @ISA @EXPORT @EXPORT_OK/;
 
-$VERSION    = '0.32';
+$VERSION    = '0.34';
 @ISA	    = 'Exporter';
 @EXPORT	    = qw/
   blib_to_par
@@ -31,7 +31,7 @@
 
 =head1 VERSION
 
-This document describes version 0.32 of PAR::Dist, released September 12, 2008.
+This document describes version 0.34 of PAR::Dist, released September 24, 2008.
 
 =head1 SYNOPSIS
 
@@ -255,7 +255,9 @@
 
     mkdir('blib', 0777);
     chdir('blib');
-    _zip(dist => File::Spec->catfile(File::Spec->updir, $file)) or die $!;
+    require Cwd;
+    my $zipoutfile = File::Spec->catfile(File::Spec->updir, $file);
+    _zip(dist => $zipoutfile);
     chdir(File::Spec->updir);
 
     unlink File::Spec->catfile("blib", "MANIFEST");
@@ -687,6 +689,8 @@
 sub _merge_meta {
   my $meta_orig_file = shift;
   my $meta_extra_file = shift;
+  return() if not defined $meta_orig_file or not -f $meta_orig_file;
+  return 1 if not defined $meta_extra_file or not -f $meta_extra_file;
 
   my $yaml_functions = _get_yaml_functions();
 
@@ -913,6 +917,7 @@
     else {
         system(qw(zip -r), $dist, File::Spec->curdir) and die $!;
     }
+    return 1;
 }