Dear list,

unfortunately my MUA has wrapped the lines. I am resending the patch below. 
Sorry for the noise.


-W/--wait is only supported by srun and should not show
up in the usage string of sbatch or salloc.
---
 src/salloc/opt.c | 2 +-
 src/sbatch/opt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 6ded7f8..4ecf63e 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -1935,7 +1935,7 @@ static void _usage(void)
 "Usage: salloc [-N numnodes|[min nodes]-[max nodes]] [-n num-processors]\n"
 "              [[-c cpus-per-node] [-r n] [-p partition] [--hold] [-t 
minutes]\n"
 "              [--immediate[=secs]] [--no-kill] [--overcommit] [-D path]\n"
-"              [--share] [-J jobname] [--jobid=id] [-W sec]\n"
+"              [--share] [-J jobname] [--jobid=id]\n"
 "              [--verbose] [--gid=group] [--uid=user] [--licenses=names]\n"
 "              [--contiguous] [--mincpus=n] [--mem=MB] [--tmp=MB] [-C list]\n"
 "              [--account=name] [--dependency=type:jobid] [--comment=name]\n"
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index b72b506..4cfc0c1 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -2991,7 +2991,7 @@ static void _usage(void)
 "              [--input file] [--output file] [--error file]\n"
 "              [--time-min=minutes] [--licenses=names] 
[--clusters=cluster_names]\n"
 "              [--workdir=directory] [--share] [-m dist] [-J jobname]\n"
-"              [--jobid=id] [--verbose] [--gid=group] [--uid=user] [-W sec] \n"
+"              [--jobid=id] [--verbose] [--gid=group] [--uid=user]\n"
 "              [--contiguous] [--mincpus=n] [--mem=MB] [--tmp=MB] [-C list]\n"
 "              [--account=name] [--dependency=type:jobid] [--comment=name]\n"
 #ifdef HAVE_BG         /* Blue gene specific options */
-- 
1.9.3


On 05/29/2015 10:14 AM, Dorian Krause wrote:
>
> [PATCH] Remove -W option from sbatch/salloc usage string
>
> -W/--wait is only supported by srun and should not show
> up in the usage string of sbatch or salloc.
> ---
>  src/salloc/opt.c | 2 +-
>  src/sbatch/opt.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/salloc/opt.c b/src/salloc/opt.c
> index 6ded7f8..4ecf63e 100644
> --- a/src/salloc/opt.c
> +++ b/src/salloc/opt.c
> @@ -1935,7 +1935,7 @@ static void _usage(void)
>  "Usage: salloc [-N numnodes|[min nodes]-[max nodes]] [-n
> num-processors]\n"
>  "              [[-c cpus-per-node] [-r n] [-p partition] [--hold] [-t
> minutes]\n"
>  "              [--immediate[=secs]] [--no-kill] [--overcommit] [-D
> path]\n"
> -"              [--share] [-J jobname] [--jobid=id] [-W sec]\n"
> +"              [--share] [-J jobname] [--jobid=id]\n"
>  "              [--verbose] [--gid=group] [--uid=user]
> [--licenses=names]\n"
>  "              [--contiguous] [--mincpus=n] [--mem=MB] [--tmp=MB] [-C
> list]\n"
>  "              [--account=name] [--dependency=type:jobid]
> [--comment=name]\n"
> diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
> index b72b506..4cfc0c1 100644
> --- a/src/sbatch/opt.c
> +++ b/src/sbatch/opt.c
> @@ -2991,7 +2991,7 @@ static void _usage(void)
>  "              [--input file] [--output file] [--error file]\n"
>  "              [--time-min=minutes] [--licenses=names]
> [--clusters=cluster_names]\n"
>  "              [--workdir=directory] [--share] [-m dist] [-J jobname]\n"
> -"              [--jobid=id] [--verbose] [--gid=group] [--uid=user] [-W
> sec] \n"
> +"              [--jobid=id] [--verbose] [--gid=group] [--uid=user]\n"
>  "              [--contiguous] [--mincpus=n] [--mem=MB] [--tmp=MB] [-C
> list]\n"
>  "              [--account=name] [--dependency=type:jobid]
> [--comment=name]\n"
>  #ifdef HAVE_BG         /* Blue gene specific options */
> -- 
> 1.9.3
>
>
>
> ------------------------------------------------------------------------------------------------
> ------------------------------------------------------------------------------------------------
> Forschungszentrum Juelich GmbH
> 52425 Juelich
> Sitz der Gesellschaft: Juelich
> Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
> Vorsitzender des Aufsichtsrats: MinDir Dr. Karl Eugen Huthmacher
> Geschaeftsfuehrung: Prof. Dr.-Ing. Wolfgang Marquardt (Vorsitzender),
> Karsten Beneke (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt,
> Prof. Dr. Sebastian M. Schmidt
> ------------------------------------------------------------------------------------------------
> ------------------------------------------------------------------------------------------------

Reply via email to