In perl.git, the branch maint-5.10 has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/2284e3ef028b60160f89ba1a877e6bdd3bc24a08?hp=bac1ae50f815c189d267d9fccb2cb35791975bf7>

- Log -----------------------------------------------------------------
commit 2284e3ef028b60160f89ba1a877e6bdd3bc24a08
Author: David Mitchell <[email protected]>
Date:   Mon Aug 17 00:53:19 2009 +0100

    last five days' merging activity

M       Porting/mergelog

commit da61ef713af21e03901954143eab9b212685f834
Author: David Mitchell <[email protected]>
Date:   Mon Aug 17 00:39:16 2009 +0100

    bump Safe version number in perldelta

M       pod/perl5101delta.pod

commit 9de9eeb1452212b331264652386099df5794d4a5
Author: David Mitchell <[email protected]>
Date:   Mon Aug 17 00:31:45 2009 +0100

    [perl #68530] "version::CLASS" warning in Safe.pm
    If any of the std variables being aliased into the Safe::rootN
    package don't actually exist, and if they are not one of the special
    "don't warn" variables, then you can get an 'only used once' warning.
    So lets not. (Also bumps version number).
    
    (cherry picked from commit a930c511fcc6cf6f5ef849a9a4a028ff1cd6e27a)

M       ext/Safe/Safe.pm
-----------------------------------------------------------------------

Summary of changes:
 Porting/mergelog      |   30 +++++++++++++++++++++++++++++-
 ext/Safe/Safe.pm      |    6 ++++--
 pod/perl5101delta.pod |    2 +-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/Porting/mergelog b/Porting/mergelog
index 8f3d4c9..2b7664b 100644
--- a/Porting/mergelog
+++ b/Porting/mergelog
@@ -3884,5 +3884,33 @@ M  f343f96080 2009/08/11 Removed '...' ellipses from 
docs about '...' flip-
 M  adbb55c01a 2009/08/11 s/PERL5OPTS/PERL5OPTS/ in INSTALL
 M  ad2561310d 2009/08/11 On Windows normalize $^X using GetLongPathName()
 M  805b101128 2009/08/12 ameliorate B::Deparse slowdown
-.  679b67fee6 2009/08/12 Don't explicitly link against msvcrt when using Mi
+M  679b67fee6 2009/08/12 Don't explicitly link against msvcrt when using Mi
 M  d62d5a537d 2009/08/12 install Config_heavy.pl in archlib
+M  94a9a4bc91 2009/08/12 Remove duplicate entry (from config_heavy.pl)
+M  521fe6911c 2009/08/12 document split in void context in perlfunc.pod
+M  47b1f09620 2009/08/12 release_managers_guide: mention testing perlbug
+M  8a00c8caf7 2009/08/12 perlbug.PL assumes patchlevel.h has simple patch l
+M  7acb6aa6c2 2009/08/12 Typos in perlbug.PL
+d  cb4bdfcf96 2009/08/12 Added a failing test for a bareword parsing regres
+d  972ee0bb66 2009/08/13 Mark as TODO the failing tests added in cb4bdfcf f
+R  9af20c7fc2 2009/08/13 Mention the unit of time
+R  e64d4d0a20 2009/08/13 Revert "Mention the unit of time"
+M  cf284a245b 2009/08/13 Perl_die_nocontext() is also called with NULL from
+M  109f04419a 2009/08/13 Merge the updated perlfaq from the perlfaq reposit
+M  ac1205a52f 2009/08/13 Updated Maintainers.pl to note that p5p/blead is r
+R  303def5230 2009/08/13 Merge commit 'dromedary/blead' into blead
+                               MERGE: ac1205a52f cf284a245b
+d  00d2151d81 2009/08/13 Revert "Revert "Mention the unit of time""
+M  4cc80fc4cb 2009/08/13 Install arch-dependent files into $archlib.
+M  d60a104409 2009/08/13 release_managers_guide: add release compare item,
+M  4a2c3333c5 2009/08/14 Add Bob Wilkinson's email address to AUTHORS
+R  d1cddda8a7 2009/08/14 Fix PROCESSOR_ARCHITECTURE in dmake builds.
+M  9b1007c4e4 2009/08/14 Import WIN64 environment variable into makefile.mk
+R  e99480546c 2009/08/15 Revert bogus PROCESSOR_ARCHITECTURE fix.
+M  76f108ac8c 2009/08/15 Explain that the load_module() import list must be
+M  c67d51c392 2009/08/15 release_managers_guide: typo fixes
+M  e13751452f 2009/08/15 quick fix cpan -r
+M  54c717c313 2009/08/15 Suppress system messages when op/ref.t calls die o
+R  5115136b5a 2009/08/16 sv_peek(): SvOOK offset is no longer in IVX
+                           maint still stores OOK in IVX
+M  a930c511fc 2009/08/16 [perl #68530] "version::CLASS" warning in Safe.pm
diff --git a/ext/Safe/Safe.pm b/ext/Safe/Safe.pm
index 9d3d589..b27c047 100644
--- a/ext/Safe/Safe.pm
+++ b/ext/Safe/Safe.pm
@@ -3,7 +3,7 @@ package Safe;
 use 5.003_11;
 use strict;
 
-$Safe::VERSION = "2.17";
+$Safe::VERSION = "2.17_01";
 
 # *** Don't declare any lexicals above this point ***
 #
@@ -243,13 +243,15 @@ sub share_from {
        my ($var, $type);
        $type = $1 if ($var = $arg) =~ s/^(\W)//;
        # warn "share_from $pkg $type $var";
-       *{$root."::$var"} = (!$type)       ? \&{$pkg."::$var"}
+       for (1..2) { # assign twice to avoid any 'used once' warnings
+           *{$root."::$var"} = (!$type)       ? \&{$pkg."::$var"}
                          : ($type eq '&') ? \&{$pkg."::$var"}
                          : ($type eq '$') ? \${$pkg."::$var"}
                          : ($type eq '@') ? \...@{$pkg."::$var"}
                          : ($type eq '%') ? \%{$pkg."::$var"}
                          : ($type eq '*') ?  *{$pkg."::$var"}
                          : croak(qq(Can't share "$type$var" of unknown type));
+       }
     }
     $obj->share_record($pkg, $vars) unless $no_record or !$vars;
 }
diff --git a/pod/perl5101delta.pod b/pod/perl5101delta.pod
index a88050b..d85f537 100644
--- a/pod/perl5101delta.pod
+++ b/pod/perl5101delta.pod
@@ -743,7 +743,7 @@ Upgraded from version 1.13 to 1.17.
 
 =item C<Safe>
 
-Upgraded from 2.12 to 2.17.
+Upgraded from 2.12 to 2.17_01.
 
 =item C<Scalar::Util>
 

--
Perl5 Master Repository

Reply via email to