Attachment #14256 for ticket #9056




			exit_code = 1;
	} else if (xstrncasecmp(tag, "jobs", MAX(tag_len, 1)) == 0 ||
		   xstrncasecmp(tag, "jobid", MAX(tag_len, 1)) == 0 ) {
		if (val) {
			char *saved_ptr;
			char *job_id = strtok_r(val, ",", &saved_ptr);
			while (job_id != NULL) {
				scontrol_print_job(job_id);
				job_id = strtok_r(NULL, ",", &saved_ptr);
			}
		} else {
			scontrol_print_job(val);
		}
	} else if (xstrncasecmp(tag, "layouts", MAX(tag_len, 2)) == 0) {
		scontrol_print_layout(argc-1, argv + 1);
	} else if (xstrncasecmp(tag, "licenses", MAX(tag_len, 2)) == 0) {

Return to ticket 9056

Lines 1697-1703 static void _show_it(int argc, char **argv) Link Here

(-)a/src/scontrol/scontrol.c (-1 / +10 lines)
1697	exit_code = 1;	1697	exit_code = 1;
1698	} else if (xstrncasecmp(tag, "jobs", MAX(tag_len, 1)) == 0 \|\|	1698	} else if (xstrncasecmp(tag, "jobs", MAX(tag_len, 1)) == 0 \|\|
1699	xstrncasecmp(tag, "jobid", MAX(tag_len, 1)) == 0 ) {	1699	xstrncasecmp(tag, "jobid", MAX(tag_len, 1)) == 0 ) {
1700	scontrol_print_job (val);	1700	if (val) {
		1701	char *saved_ptr;
		1702	char *job_id = strtok_r(val, ",", &saved_ptr);
		1703	while (job_id != NULL) {
		1704	scontrol_print_job(job_id);
		1705	job_id = strtok_r(NULL, ",", &saved_ptr);
		1706	}
		1707	} else {
		1708	scontrol_print_job(val);
		1709	}
1701	} else if (xstrncasecmp(tag, "layouts", MAX(tag_len, 2)) == 0) {	1710	} else if (xstrncasecmp(tag, "layouts", MAX(tag_len, 2)) == 0) {
1702	scontrol_print_layout(argc-1, argv + 1);	1711	scontrol_print_layout(argc-1, argv + 1);
1703	} else if (xstrncasecmp(tag, "licenses", MAX(tag_len, 2)) == 0) {	1712	} else if (xstrncasecmp(tag, "licenses", MAX(tag_len, 2)) == 0) {

Lines 329-340 or Link Here

(-)a/doc/man/man1/scontrol.1 (-3 / +5 lines)
329	Display the state of the specified entity with the specified identification.	329	Display the state of the specified entity with the specified identification.
330	\fIENTITY\fP may be \fIaliases\fP, \fIassoc_mgr\fP, \fIbbstat\fP,	330	\fIENTITY\fP may be \fIaliases\fP, \fIassoc_mgr\fP, \fIbbstat\fP,
331	\fIburstbuffer\fP, \fIconfig\fP, \fIdaemons\fP, \fIdwstat\fP,	331	\fIburstbuffer\fP, \fIconfig\fP, \fIdaemons\fP, \fIdwstat\fP,
332	\fIfederation\fP, \fIfrontend\fP, \fIjob\fP, \fInode\fP,	332	\fIfederation\fP, \fIfrontend\fP, \fInode\fP,
333	\fIpartition\fP, \fIpowercap\fP, \fIreservation\fP, \fIslurmd\fP, \fIstep\fP,	333	\fIpartition\fP, \fIpowercap\fP, \fIreservation\fP, \fIslurmd\fP, \fIstep\fP,
334	\fItopology\fP, \fIhostlist\fP, \fIhostlistsorted\fP or \fIhostnames\fP	334	\fItopology\fP, \fIhostlist\fP, \fIhostlistsorted\fP or \fIhostnames\fP
335	\fIID\fP can be used to identify a specific element of the identified	335	\fIID\fP can be used to identify a specific element of the identified
336	entity: job ID, node name, partition name, reservation name, or job step ID for	336	entity: node name, partition name, reservation name, or job step ID for
337	\fIjob\fP, \fInode\fP, \fIpartition\fP, or \fIstep\fP respectively.	337	\fInode\fP, \fIpartition\fP, or \fIstep\fP respectively.
		338	For an \fIENTITY\fP of \fIjob\fP it can be used a coma separated list of \fIjob\fP:
		339	\fIjob\fP=<JobId1>[,...,<JobIdN>]
338	For an \fIENTITY\fP of \fIbbstat\fP or \fIdwstat\fP (they are equivalent)	340	For an \fIENTITY\fP of \fIbbstat\fP or \fIdwstat\fP (they are equivalent)
339	optional arguments are the options of the local status command.	341	optional arguments are the options of the local status command.
340	The status commands will be executed by the slurmctld daemon and its response	342	The status commands will be executed by the slurmctld daemon and its response