Date: Wed, 15 Apr 2020 12:50:33 +0000 (UTC) From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531764 - in head/sysutils/slurm-wlm: . files Message-ID: <202004151250.03FCoXGo008142@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jwb Date: Wed Apr 15 12:50:33 2020 New Revision: 531764 URL: https://svnweb.freebsd.org/changeset/ports/531764 Log: sysutils/slurm-wlm: Revert error file to stderr when redirect no longer needed Fixes an oversight in a new patch for 20.02.1 Modified: head/sysutils/slurm-wlm/Makefile head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Wed Apr 15 12:30:28 2020 (r531763) +++ head/sysutils/slurm-wlm/Makefile Wed Apr 15 12:50:33 2020 (r531764) @@ -2,6 +2,7 @@ PORTNAME= slurm DISTVERSION= 20.02.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm Modified: head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c ============================================================================== --- head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c Wed Apr 15 12:30:28 2020 (r531763) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c Wed Apr 15 12:50:33 2020 (r531764) @@ -16,7 +16,7 @@ #include "slurm/slurm.h" #include "slurm/slurm_errno.h" #include "src/common/log.h" -@@ -179,6 +188,52 @@ proctrack_p_wait(uint64_t cont_id) +@@ -179,6 +188,55 @@ proctrack_p_wait(uint64_t cont_id) return SLURM_SUCCESS; } @@ -47,7 +47,10 @@ + proc_list = procstat_getprocs(proc_info, KERN_PROC_PGRP, cont_id, + (unsigned int *) &pid_count); + if (procstat_err) ++ { ++ err_set_file(NULL); + fclose(procstat_err); ++ } + + if (pid_count > 0) { + xrecalloc(pid_array, sizeof(pid_t), pid_count); @@ -69,7 +72,7 @@ extern int proctrack_p_get_pids(uint64_t cont_id, pid_t **pids, int *npids) { -@@ -241,3 +296,4 @@ fini: *pids = pid_array; +@@ -241,3 +299,4 @@ fini: *pids = pid_array; *npids = pid_count; return rc; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004151250.03FCoXGo008142>