r31971 - in /branches/upstream/libpar-perl/current: AUTHORS ChangeLog MANIFEST META.yml lib/PAR.pm t/60-cleanup.t

[eloy at users.alioth.debian.org]

Author: eloy
Date: Thu Mar 12 10:00:23 2009
New Revision: 31971

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

Removed:
    branches/upstream/libpar-perl/current/t/60-cleanup.t
Modified:
    branches/upstream/libpar-perl/current/AUTHORS
    branches/upstream/libpar-perl/current/ChangeLog
    branches/upstream/libpar-perl/current/MANIFEST
    branches/upstream/libpar-perl/current/META.yml
    branches/upstream/libpar-perl/current/lib/PAR.pm

Modified: branches/upstream/libpar-perl/current/AUTHORS
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/AUTHORS?rev=31971&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/AUTHORS (original)
+++ branches/upstream/libpar-perl/current/AUTHORS Thu Mar 12 10:00:23 2009
@@ -70,6 +70,7 @@
 Jesse Vincent                 (JESSE)
 Jody Belka                    (KNEW)
 Johan Lindstroem              (JOHANL)
+Johannes Lode
 John McMahon
 John Siracusa                 (JSIRACUSA)
 Jonathan Leffler              (JOHNL)

Modified: branches/upstream/libpar-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/ChangeLog?rev=31971&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/ChangeLog (original)
+++ branches/upstream/libpar-perl/current/ChangeLog Thu Mar 12 10:00:23 2009
@@ -1,3 +1,11 @@
+
+[Changes for 0.991 - Mar 10, 2009]
+  - Promote previous release to stable release.
+
+[Changes for 0.989_01 - Mar  2, 2009]
+* Bug fixes, etc.
+  - Track the locations of all archives that have been extracted to
+    $ENV{PAR_TEMP}/inc in this run.
 
 [Changes for 0.988 - Mar  1, 2009]
   - Promote previous release to stable release.

Modified: branches/upstream/libpar-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/MANIFEST?rev=31971&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/MANIFEST (original)
+++ branches/upstream/libpar-perl/current/MANIFEST Thu Mar 12 10:00:23 2009
@@ -29,7 +29,6 @@
 t/01-basic.t
 t/40-par-hashref.t
 t/50-autoloaderfix.t
-t/60-cleanup.t
 t/hello.par
 t/Hello.pm
 TODO

Modified: branches/upstream/libpar-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/META.yml?rev=31971&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/META.yml (original)
+++ branches/upstream/libpar-perl/current/META.yml Thu Mar 12 10:00:23 2009
@@ -16,7 +16,7 @@
 provides:
   PAR:
     file: lib/PAR.pm
-    version: 0.988
+    version: 0.991
   PAR::Heavy:
     file: lib/PAR/Heavy.pm
     version: 0.11
@@ -35,4 +35,4 @@
   perl: 5.6.0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.988
+version: 0.991

Modified: branches/upstream/libpar-perl/current/lib/PAR.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-perl/current/lib/PAR.pm?rev=31971&op=diff
==============================================================================
--- branches/upstream/libpar-perl/current/lib/PAR.pm (original)
+++ branches/upstream/libpar-perl/current/lib/PAR.pm Thu Mar 12 10:00:23 2009
@@ -1,5 +1,5 @@
 package PAR;
-$PAR::VERSION = '0.988';
+$PAR::VERSION = '0.991';
 
 use 5.006;
 use strict;
@@ -35,7 +35,7 @@
 
 =head1 VERSION
 
-This document describes release 0.988 of PAR, released March 1, 2009.
+This document describes release 0.989_01 of PAR, released March 2, 2009.
 
 =head1 SYNOPSIS
 
@@ -317,6 +317,7 @@
 use vars qw(%FileCache);            # The Zip-file file-name-cache
                                     # Layout:
                                     # $FileCache{$ZipObj}{$FileName} = $Member
+use vars qw(%ArchivesExtracted);    # Associates archive-zip-object => full extraction path
 
 my $ver  = $Config{version};
 my $arch = $Config{archname};
@@ -379,6 +380,11 @@
         push @PAR_INC, unpar($progname, undef, undef, 1);
 
         _extract_inc($progname) unless $ENV{PAR_CLEAN};
+        if ($LibCache{$progname}) {
+          # XXX bad: this us just a good guess
+          require File::Spec;
+          $ArchivesExtracted{$progname} = File::Spec->catdir($ENV{PAR_TEMP}, 'inc');
+        }
 
         my $zip = $LibCache{$progname};
         my $member = _first_member( $zip,
@@ -558,6 +564,26 @@
     return;
 }
 
+# Given an Archive::Zip object, this finds the first 
+# Archive::Zip member whose file name matches the
+# regular expression
+sub _first_member_matching {
+    my $zip = shift;
+    my $regex = shift;
+
+    my $cache = $FileCache{$zip};
+    $cache = $FileCache{$zip} = _make_file_cache($zip) if not $cache;
+
+    foreach my $name (keys %$cache) {
+      if ($name =~ $regex) {
+        return $cache->{$name};
+      }
+    }
+
+    return();
+}
+
+
 sub _run_member_from_par {
     my $member = shift;
     my $clear_stack = shift;
@@ -667,6 +693,8 @@
         }
         
         rmdir("$inc.lock");
+
+        $ArchivesExtracted{$is_handle ? $file_or_azip_handle->fileName() : $file_or_azip_handle} = $inc;
     }
 
     # add the freshly extracted directories to @INC,