From 95ecf18d0c70d8b4ab27fd9f08ce6c688083dc1f Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Fri, 25 Oct 2019 00:47:38 +0200 Subject: [PATCH] parallel: CPU detection bug on Android fixed. --- src/niceload | 2 +- src/parallel | 4 ++-- src/parallel.pod | 4 ++-- src/sql | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/niceload b/src/niceload index 474d5ee6..5e624c95 100755 --- a/src/niceload +++ b/src/niceload @@ -23,7 +23,7 @@ use strict; use Getopt::Long; $Global::progname="niceload"; -$Global::version = 20191022; +$Global::version = 20191023; Getopt::Long::Configure("bundling","require_order"); get_options_from_array(\@ARGV) || die_usage(); if($opt::version) { diff --git a/src/parallel b/src/parallel index e1e9d3f4..c26b30de 100755 --- a/src/parallel +++ b/src/parallel @@ -2071,7 +2071,7 @@ sub check_invalid_option_combinations() { sub init_globals() { # Defaults: - $Global::version = 20191022; + $Global::version = 20191023; $Global::progname = 'parallel'; $::name = "GNU Parallel"; $Global::infinity = 2**31; @@ -7281,7 +7281,7 @@ sub sct_android($) { # 'threads' => #threads # 'active' => #taskset_threads } # Use GNU/Linux - return sct_gnu_linux(@_); + return sct_gnu_linux($_[0]); } sub sct_freebsd($) { diff --git a/src/parallel.pod b/src/parallel.pod index d2e382f7..0775f845 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -1599,7 +1599,7 @@ Overrides an earlier B<--keep-order> (e.g. if set in B<~/.parallel/config>). -=item B<--nice> I (beta testing) +=item B<--nice> I Run the command at this niceness. @@ -2191,7 +2191,7 @@ Only supported in B. See also B<--env>, B<--record-env>. -=item B<--shard> I (beta testing) +=item B<--shard> I Use I as shard key and shard input to the jobs. diff --git a/src/sql b/src/sql index 4bcdd555..859f9e0d 100755 --- a/src/sql +++ b/src/sql @@ -574,7 +574,7 @@ $Global::Initfile && unlink $Global::Initfile; exit ($err); sub parse_options { - $Global::version = 20191022; + $Global::version = 20191023; $Global::progname = 'sql'; # This must be done first as this may exec myself