diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2017-12-30 06:13:22 +0800 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2017-12-30 06:13:22 +0800 |
| commit | 81e1fde0e0d479e56da256be02df9e0fb4605c2d (patch) | |
| tree | 9974b7636fb52d781884eefd1f24201acaab4de7 /ports-mgmt | |
| parent | 9f091f12509ddd687d0e8dac006c90cab420408e (diff) | |
| download | freebsd-ports-gnome-81e1fde0e0d479e56da256be02df9e0fb4605c2d.tar.gz freebsd-ports-gnome-81e1fde0e0d479e56da256be02df9e0fb4605c2d.tar.zst freebsd-ports-gnome-81e1fde0e0d479e56da256be02df9e0fb4605c2d.zip | |
Fix regression in kill_bad_children: add missing $ before progcmd ...
Approved by: antoine (implicit)
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index fa8513417028..92a0a4169ab3 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -1,5 +1,21 @@ ---- portmaster.orig 2017-12-21 09:02:44 UTC +--- portmaster.orig 2017-12-29 22:11:06 UTC +++ portmaster +@@ -113,13 +113,13 @@ kill_bad_children () { + [ "$pid" -gt 25 ] || continue + case "$ppid" in + 1) case "$command" in +- *" progcmd "*) pm_kill $pid ;; ++ *" $progcmd "*) pm_kill $pid ;; + *'make -DBATCH checksum'*|*'/fetch '*|\[sh\]) pm_kill -9 $pid ;; + esac ;; + *) [ $pgid -eq $mypgid ] || continue + [ $pid -eq $PM_PARENT_PID ] && continue + case "$command" in +- *" progcmd "*) pm_kill $pid ;; ++ *" $progcmd "*) pm_kill $pid ;; + *'make -DBATCH checksum'*|*'/fetch '*|\[sh\]) pm_kill $pid ;; + esac ;; + esac @@ -1616,15 +1616,14 @@ pm_pkg_create () { NB_DELETE="${NB_DELETE}${pkg} " fi |