[libmodule-load-conditional-perl] 01/03: Imported Upstream version 0.58

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository libmodule-load-conditional-perl.

commit f661ea12c35f9a9db7e4e80881d6fa72ecd9666f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Sep 10 02:07:06 2013 -0400

    Imported Upstream version 0.58
---
 CHANGES                        |    9 +++++++++
 META.json                      |    4 ++--
 META.yml                       |    4 ++--
 Makefile.PL                    |    1 -
 lib/Module/Load/Conditional.pm |   13 +++++++++----
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index d8716b6..28546ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+Changes for 0.58    Sun Sep  1 11:21:59 BST 2013
+=================================================
+* RT#83728 make quoting work portably and remove
+  prototypes from one-liner in requires()
+
+Changes for 0.56    Thu Aug 29 21:29:22 BST 2013
+=================================================
+* RT#83728 make requires() more robust
+
 Changes for 0.54    Sun Aug 12 09:10:13 BST 2012
 =================================================
 * VMS test fixes from Craig Berry
diff --git a/META.json b/META.json
index 3894f22..5cab241 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "Jos Boumans <kane[at]cpan.org>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921",
+   "generated_by" : "ExtUtils::MakeMaker version 6.74, CPAN::Meta::Converter version 2.132140",
    "license" : [
       "perl_5"
    ],
@@ -48,5 +48,5 @@
          "url" : "https://github.com/jib/module-load-conditional"
       }
    },
-   "version" : "0.54"
+   "version" : "0.58"
 }
diff --git a/META.yml b/META.yml
index 2a9ebe2..5c8a376 100644
--- a/META.yml
+++ b/META.yml
@@ -7,7 +7,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: 0
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.120921'
+generated_by: 'ExtUtils::MakeMaker version 6.74, CPAN::Meta::Converter version 2.132140'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -27,4 +27,4 @@ requires:
   version: 0.69
 resources:
   repository: https://github.com/jib/module-load-conditional
-version: 0.54
+version: 0.58
diff --git a/Makefile.PL b/Makefile.PL
index e01c997..90d51f3 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -53,4 +53,3 @@ sub WriteMakefile1 {  #Written by Alexandr Ciornii, version 0.21. Added by eumm-
 
     WriteMakefile(%params);
 }
-
diff --git a/lib/Module/Load/Conditional.pm b/lib/Module/Load/Conditional.pm
index 342371f..c890df0 100644
--- a/lib/Module/Load/Conditional.pm
+++ b/lib/Module/Load/Conditional.pm
@@ -13,14 +13,16 @@ use version;
 
 use Module::Metadata ();
 
-use constant ON_VMS  => $^O eq 'VMS';
+use constant ON_VMS   => $^O eq 'VMS';
+use constant ON_WIN32 => $^O eq 'MSWin32' ? 1 : 0;
+use constant QUOTE    => do { ON_WIN32 ? q["] : q['] };
 
 BEGIN {
     use vars        qw[ $VERSION @ISA $VERBOSE $CACHE @EXPORT_OK $DEPRECATED
                         $FIND_VERSION $ERROR $CHECK_INC_HASH];
     use Exporter;
     @ISA            = qw[Exporter];
-    $VERSION        = '0.54';
+    $VERSION        = '0.58';
     $VERBOSE        = 0;
     $DEPRECATED     = 0;
     $FIND_VERSION   = 1;
@@ -195,7 +197,7 @@ sub check_install {
         }
     }
 
-    ### we didnt find the filename yet by looking in %INC,
+    ### we didn't find the filename yet by looking in %INC,
     ### so scan the dirs
     unless( $filename ) {
 
@@ -495,12 +497,15 @@ sub requires {
     }
 
     my $lib = join " ", map { qq["-I$_"] } @INC;
-    my $cmd = qq["$^X" $lib -M$who -e"print(join(qq[\\n],keys(%INC)))"];
+    my $oneliner = 'print(join(qq[\n],map{qq[BONG=$_]}keys(%INC)),qq[\n])';
+    my $cmd = join '', qq["$^X" $lib -M$who -e], QUOTE, $oneliner, QUOTE;
 
     return  sort
                 grep { !/^$who$/  }
                 map  { chomp; s|/|::|g; $_ }
                 grep { s|\.pm$||i; }
+                map  { s!^BONG\=!!; $_ }
+                grep { m!^BONG\=! }
             `$cmd`;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmodule-load-conditional-perl.git