diff options
| author | Jason W. Bacon <jwb@FreeBSD.org> | 2020-04-15 20:50:33 +0800 |
|---|---|---|
| committer | Jason W. Bacon <jwb@FreeBSD.org> | 2020-04-15 20:50:33 +0800 |
| commit | 431f2257d1b4de53981235761d1675cd2d80e9e2 (patch) | |
| tree | 9152dbfa6e4e96c45fbf5913e43c8f49c1eebd74 /sysutils | |
| parent | be01f7c0f6e8f6ef11cace62bfb2b4920abbc569 (diff) | |
| download | freebsd-ports-gnome-431f2257d1b4de53981235761d1675cd2d80e9e2.tar.gz freebsd-ports-gnome-431f2257d1b4de53981235761d1675cd2d80e9e2.tar.zst freebsd-ports-gnome-431f2257d1b4de53981235761d1675cd2d80e9e2.zip | |
sysutils/slurm-wlm: Revert error file to stderr when redirect no longer needed
Fixes an oversight in a new patch for 20.02.1
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/slurm-wlm/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 38eb6c07398c..6fd5566df4fd 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -2,6 +2,7 @@ PORTNAME= slurm DISTVERSION= 20.02.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c b/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c index 29fa639c3cd2..ed669163147c 100644 --- a/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c +++ b/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c @@ -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; } |