Date: Fri, 29 Dec 2017 22:13:22 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457547 - head/ports-mgmt/portmaster/files Message-ID: <201712292213.vBTMDM5t052355@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Fri Dec 29 22:13:22 2017 New Revision: 457547 URL: https://svnweb.freebsd.org/changeset/ports/457547 Log: Fix regression in kill_bad_children: add missing $ before progcmd ... Approved by: antoine (implicit) Modified: head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Fri Dec 29 22:12:59 2017 (r457546) +++ head/ports-mgmt/portmaster/files/patch-portmaster Fri Dec 29 22:13:22 2017 (r457547) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712292213.vBTMDM5t052355>