From 20f74d61b7202ca4f9703f5ce8ab9e07e433a232 Mon Sep 17 00:00:00 2001
From: Janne Blomqvist <janne.blomqvist@aalto.fi>
Date: Tue, 9 Sep 2014 15:58:57 -0700
Subject: [PATCH] Enlarge the jobid field to 18 chars in squeue output.

---
 doc/man/man1/sprio.1  | 4 ++--
 doc/man/man1/squeue.1 | 2 +-
 src/squeue/opts.c     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man/man1/sprio.1 b/doc/man/man1/sprio.1
index 5aee2709b12..075a2db7019 100644
--- a/doc/man/man1/sprio.1
+++ b/doc/man/man1/sprio.1
@@ -53,10 +53,10 @@ assigned non-zero weights are
 .RS
 .TP 15
 \fIdefault\fR
-"%.7i %.10Y %.10A %.10F %.10J %.10P %.10Q"
+"%.15i %.10Y %.10A %.10F %.10J %.10P %.10Q"
 .TP
 \fI\-l, \-\-long\fR
-"%.7i %.8u %.10Y %.10A %.10F %.10J %.10P %.10Q %.6N"
+"%.15i %.8u %.10Y %.10A %.10F %.10J %.10P %.10Q %.6N"
 .RE
 
 .IP
diff --git a/doc/man/man1/squeue.1 b/doc/man/man1/squeue.1
index 61ac87a7faa..96a9f9b0b31 100644
--- a/doc/man/man1/squeue.1
+++ b/doc/man/man1/squeue.1
@@ -911,7 +911,7 @@ name then within a given partition by increasing step id).
 Report the expected start time and resources to be allocated for pending jobs
 in order of increasing start time.
 This is equivalent to the following options:
-\fB\-\-format="%.7i %.9P %.8j %.8u %.2t  %.19S %.6D %20Y %R"\fR,
+\fB\-\-format="%.18i %.9P %.8j %.8u %.2t  %.19S %.6D %20Y %R"\fR,
 \fB\-\-sort=S\fR and \fB\-\-states=PENDING\fR.
 Any of these options may be explicitly changed as desired by
 combining the \fB\-\-start\fR option with other option values
diff --git a/src/squeue/opts.c b/src/squeue/opts.c
index 1fa67a89ecb..c075199fe8b 100644
--- a/src/squeue/opts.c
+++ b/src/squeue/opts.c
@@ -421,7 +421,7 @@ parse_command_line( int argc, char* argv[] )
 	if ( params.start_flag && !params.step_flag ) {
 		/* Set more defaults */
 		if (params.format == NULL)
-			params.format = xstrdup("%.7i %.9P %.8j %.8u %.2t %.19S %.6D %20Y %R");
+			params.format = xstrdup("%.18i %.9P %.8j %.8u %.2t %.19S %.6D %20Y %R");
 		if (params.sort == NULL)
 			params.sort = xstrdup("S");
 		if (params.states == NULL) {
-- 
GitLab