components/parallel/patches/src.sql.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Thu, 25 Jul 2013 22:11:17 -0700
branchs11-update
changeset 2701 9b48e71485e7
parent 2560 b47f3c154b60
child 5383 daa35fd7ea40
permissions -rw-r--r--
15820215 SUNBT7202655 Move python/cssutils from Desktop consolidation to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2560
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
This patch is needed because the sql script is expecting the which 
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
command to return errors on stderr, not stdout and assumes anything
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
on stdout is an actual path.   (And since /bin/which starts a new 
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
csh, it only checks .cshrc $PATH not current $PATH settings.)
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
--- parallel-20120422/src/sql.orig	2012-12-11 13:21:20.855778203 -0800
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
+++ parallel-20120422/src/sql	2012-12-11 13:22:33.870295549 -0800
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
@@ -890,7 +890,7 @@
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
 sub find_command_in_path {
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
     # Find the command if it exists in the current path
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
     my $command = shift;
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
-    my $path = `which $command`;
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
+    my $path = `/usr/gnu/bin/which $command`;
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
     chomp $path;
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
     return $path;
b47f3c154b60 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
 }