r53202 - in /branches/upstream/libsysadm-install-perl/current: Changes META.yml Makefile.PL README lib/Sysadm/Install.pm t/003slurp.t t/005qquote.t t/006perm.t t/012tap.t

angelabad-guest at users.alioth.debian.org angelabad-guest at users.alioth.debian.org
Mon Feb 22 16:17:27 UTC 2010


Author: angelabad-guest
Date: Mon Feb 22 16:17:15 2010
New Revision: 53202

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

Modified:
    branches/upstream/libsysadm-install-perl/current/Changes
    branches/upstream/libsysadm-install-perl/current/META.yml
    branches/upstream/libsysadm-install-perl/current/Makefile.PL
    branches/upstream/libsysadm-install-perl/current/README
    branches/upstream/libsysadm-install-perl/current/lib/Sysadm/Install.pm
    branches/upstream/libsysadm-install-perl/current/t/003slurp.t
    branches/upstream/libsysadm-install-perl/current/t/005qquote.t
    branches/upstream/libsysadm-install-perl/current/t/006perm.t
    branches/upstream/libsysadm-install-perl/current/t/012tap.t

Modified: branches/upstream/libsysadm-install-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/Changes?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/Changes (original)
+++ branches/upstream/libsysadm-install-perl/current/Changes Mon Feb 22 16:17:15 2010
@@ -1,6 +1,11 @@
 ########################################
 Revision history for Sysadm::Install
 ########################################
+
+0.34  (2010/02/21)
+    (ms) Added github repository link to Makefile.PL
+    (ms) [RT 53324] bin_find fix for Windows using $Config::Config{path_sep}
+    (ms) [RT 54555] Fixed test suite errors on Win32
 
 0.33 (2009/09/12)
     (ms) utf8_available() now uses eval"" to check for Encode module, 

Modified: branches/upstream/libsysadm-install-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/META.yml?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/META.yml (original)
+++ branches/upstream/libsysadm-install-perl/current/META.yml Mon Feb 22 16:17:15 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Sysadm-Install
-version:            0.33
+version:            0.34
 abstract:           Typical installation tasks for system administrators
 author:
     - Mike Schilli <m at perlmeister.com>

Modified: branches/upstream/libsysadm-install-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/Makefile.PL?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/Makefile.PL (original)
+++ branches/upstream/libsysadm-install-perl/current/Makefile.PL Mon Feb 22 16:17:15 2010
@@ -2,6 +2,14 @@
 use ExtUtils::MakeMaker;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
+
+my $meta_merge = {
+    META_MERGE => {
+        resources => {
+            repository  => 'http://github.com/mschilli/sysadm-install-perl',
+        },
+    }
+};
 
 eval {
     require Expect;
@@ -41,11 +49,8 @@
         Cwd             => 0,
         File::Temp      => 0.16,
                          }, # e.g., Module::Name => 1.1
-    META_MERGE          => {
-        resources       => {
-            repository  => 'http://github.com/mschilli/sysadm-install-perl',
-        },
-    },
+   
+    $ExtUtils::MakeMaker::VERSION >= 6.50 ? (%$meta_merge) : (),
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM  => 'lib/Sysadm/Install.pm', # retrieve abstract from module
        AUTHOR         => 'Mike Schilli <m at perlmeister.com>') : ()),

Modified: branches/upstream/libsysadm-install-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/README?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/README (original)
+++ branches/upstream/libsysadm-install-perl/current/README Mon Feb 22 16:17:15 2010
@@ -1,5 +1,5 @@
 ######################################################################
-    Sysadm::Install 0.33
+    Sysadm::Install 0.34
 ######################################################################
 
 NAME

Modified: branches/upstream/libsysadm-install-perl/current/lib/Sysadm/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/lib/Sysadm/Install.pm?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/lib/Sysadm/Install.pm (original)
+++ branches/upstream/libsysadm-install-perl/current/lib/Sysadm/Install.pm Mon Feb 22 16:17:15 2010
@@ -6,7 +6,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.33';
+our $VERSION = '0.34';
 
 use File::Copy;
 use File::Path;
@@ -1345,7 +1345,11 @@
 ######################################
     my($exe) = @_;
 
-    for my $path (split /:/, $ENV{PATH}) {
+    require Config;
+    my $path_sep = ":";
+    $path_sep = $Config::Config{path_sep} if defined $Config::Config{path_sep};
+
+    for my $path (split /$path_sep/, $ENV{PATH}) {
         my $full = File::Spec->catfile($path, $exe);
 
         return $full if -x $full;

Modified: branches/upstream/libsysadm-install-perl/current/t/003slurp.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/t/003slurp.t?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/t/003slurp.t (original)
+++ branches/upstream/libsysadm-install-perl/current/t/003slurp.t Mon Feb 22 16:17:15 2010
@@ -29,8 +29,11 @@
 #####################################################################
 # Blurt atomically
 #####################################################################
-blurt_atomic("one\ntwo\nthree", $TMP_FILE);
-ok(-f $TMP_FILE, "$TMP_FILE exists");
+SKIP: {
+  skip "Renaming tmp files not supported on Win32", 1 if $^O eq "MSWin32";
+  blurt_atomic("one\ntwo\nthree", $TMP_FILE);
+  ok(-f $TMP_FILE, "$TMP_FILE exists");
+}
 
 #####################################################################
 # Slurp

Modified: branches/upstream/libsysadm-install-perl/current/t/005qquote.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/t/005qquote.t?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/t/005qquote.t (original)
+++ branches/upstream/libsysadm-install-perl/current/t/005qquote.t Mon Feb 22 16:17:15 2010
@@ -14,22 +14,26 @@
 
 ok(1, "loading ok");
 
-my $script  = 'print "$< rocks!\\n";';
-my $escaped = qquote($script, '!$'); # Escape for shell use
-my $out = `perl -e $escaped`;
+SKIP: {
+  skip "Quoting not supported on Win32", 4 if $^O eq "MSWin32";
 
-is($out, "$< rocks!\n", "simple escape");
-
-$escaped = qquote($script, '!$][)('); # Escape for shell use
-
-    # shell escape
-$escaped = qquote('[some]$thing(weird)"`', ":shell");
-is($escaped, '"[some]\\$thing(weird)\\"\\`"', ":shell");
-
-    # single quote
-$escaped = quote("[some]\$thing(weird)'`");
-is($escaped, "'[some]\$thing(weird)\\'`'", "single quote");
-
-    # single quote containing single quote
-$escaped = quote("foo'bar", ":shell");
-is($escaped, "'foo'\\''bar'", "foo'bar");
+  my $script  = 'print "$< rocks!\\n";';
+  my $escaped = qquote($script, '!$'); # Escape for shell use
+  my $out = `$^X -e $escaped`;
+  
+  is($out, "$< rocks!\n", "simple escape");
+  
+  $escaped = qquote($script, '!$][)('); # Escape for shell use
+  
+      # shell escape
+  $escaped = qquote('[some]$thing(weird)"`', ":shell");
+  is($escaped, '"[some]\\$thing(weird)\\"\\`"', ":shell");
+  
+      # single quote
+  $escaped = quote("[some]\$thing(weird)'`");
+  is($escaped, "'[some]\$thing(weird)\\'`'", "single quote");
+  
+      # single quote containing single quote
+  $escaped = quote("foo'bar", ":shell");
+  is($escaped, "'foo'\\''bar'", "foo'bar");
+}

Modified: branches/upstream/libsysadm-install-perl/current/t/006perm.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/t/006perm.t?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/t/006perm.t (original)
+++ branches/upstream/libsysadm-install-perl/current/t/006perm.t Mon Feb 22 16:17:15 2010
@@ -14,12 +14,17 @@
 
 ok(1, "loading ok");
 
-my $testfile = File::Spec->catfile($TEST_DIR, "test_file");
-blurt("waaaah!", $testfile);
-END { unlink $testfile, "${testfile}_2" }; 
+my $testfile = "";
 
-chmod(0755, $testfile) or die "Cannot chmod";
-cp($testfile, "${testfile}_2");
-Sysadm::Install::perm_cp($testfile, "${testfile}_2");
+SKIP: {
+  skip "Executable file perms not supported on Win32", 1 if $^O eq "MSWin32";
+  $testfile = File::Spec->catfile($TEST_DIR, "test_file");
+  blurt("waaaah!", $testfile);
+  END { unlink $testfile, "${testfile}_2" }; 
 
-ok(-x "${testfile}_2", "copied file has same permissions");
+  chmod(0755, $testfile) or die "Cannot chmod";
+  cp($testfile, "${testfile}_2");
+  Sysadm::Install::perm_cp($testfile, "${testfile}_2");
+  
+  ok(-x "${testfile}_2", "copied file has same permissions");
+}

Modified: branches/upstream/libsysadm-install-perl/current/t/012tap.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsysadm-install-perl/current/t/012tap.t?rev=53202&op=diff
==============================================================================
--- branches/upstream/libsysadm-install-perl/current/t/012tap.t (original)
+++ branches/upstream/libsysadm-install-perl/current/t/012tap.t Mon Feb 22 16:17:15 2010
@@ -6,5 +6,8 @@
 
 use Sysadm::Install qw(:all);
 
-my($stdout, $stderr, $rc) = tap "echo", "'";
-is($stdout, "'\n", "single quoted tap");
+SKIP: {
+  skip "echo not supported on Win32", 1 if $^O eq "MSWin32";
+  my($stdout, $stderr, $rc) = tap "echo", "'";
+  is($stdout, "'\n", "single quoted tap");
+}




More information about the Pkg-perl-cvs-commits mailing list