components/parallel/patches/src.sql.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Sat, 24 Sep 2016 09:29:15 -0700
changeset 6971 32152bc508b7
parent 5383 daa35fd7ea40
permissions -rw-r--r--
Close of build 109.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5383
daa35fd7ea40 20045498 Upgrade Parallel to latest version
Rich Burridge <rich.burridge@oracle.com>
parents: 1083
diff changeset
     1
This patch is needed because the sql script is expecting the which
1083
dcfa3638d3e2 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
5383
daa35fd7ea40 20045498 Upgrade Parallel to latest version
Rich Burridge <rich.burridge@oracle.com>
parents: 1083
diff changeset
     3
on stdout is an actual path.   (And since /bin/which starts a new
1083
dcfa3638d3e2 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.)
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
5383
daa35fd7ea40 20045498 Upgrade Parallel to latest version
Rich Burridge <rich.burridge@oracle.com>
parents: 1083
diff changeset
     6
This patch will not be sent upstream.
daa35fd7ea40 20045498 Upgrade Parallel to latest version
Rich Burridge <rich.burridge@oracle.com>
parents: 1083
diff changeset
     7
1083
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
--- parallel-20120422/src/sql.orig	2012-12-11 13:21:20.855778203 -0800
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
+++ parallel-20120422/src/sql	2012-12-11 13:22:33.870295549 -0800
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
@@ -890,7 +890,7 @@
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
 sub find_command_in_path {
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
     # Find the command if it exists in the current path
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
     my $command = shift;
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
-    my $path = `which $command`;
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
+    my $path = `/usr/gnu/bin/which $command`;
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
     chomp $path;
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
     return $path;
dcfa3638d3e2 PSARC 2012/182 GNU parallel version 20120422
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 }