Date: Fri, 6 Jul 2012 00:09:26 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r238155 - user/dougb/portmaster Message-ID: <201207060009.q6609Qg9027699@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Fri Jul 6 00:09:26 2012 New Revision: 238155 URL: http://svn.freebsd.org/changeset/base/238155 Log: * More whitespace twiddles * If using -i and there is an +IGNORME file, the default should be no Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Jul 6 00:04:22 2012 (r238154) +++ user/dougb/portmaster/portmaster Fri Jul 6 00:09:26 2012 (r238155) @@ -172,13 +172,15 @@ parent_exit () { count=$(( $count + 1 )) if [ $count -eq 1 ]; then echo "===>>> Waiting for background 'make clean' processes to finish" + needws=needws elif [ $count -eq 10 ]; then count=0 fi sleep 2 done - pm_v "===>>> Removing empty directories from WRKDIRPREFIX" ; pm_v + pm_v "===>>> Removing empty directories from WRKDIRPREFIX" + [ -n "$needws" ] && echo '' || pm_v find $PM_WRKDIRPREFIX -depth -mindepth 1 -type d -empty -delete 2>/dev/null fi @@ -1056,6 +1058,7 @@ IFS=' if [ -n "$d_iport" ]; then pm_v " ===>>> Updating @pkgdep for $d_origin" else + echo '' echo " ===>>> $d_origin is listed as a dependency" echo " ===>>> but there is no installed version" echo '' @@ -1307,7 +1310,7 @@ parse_index () { } update_required_by () { - # Global: grep_deps + # Global: grep_deps needws local do_update if [ -e "$pdb/$1/+REQUIRED_BY" ]; then @@ -1318,6 +1321,7 @@ update_required_by () { fi if [ -n "$do_update" ]; then pm_v " ===>>> Updating $1/+REQUIRED_BY" + needws=needws_urb pm_install_s $grep_deps $pdb/$1/+REQUIRED_BY fi @@ -2199,13 +2203,20 @@ check_interactive () { echo '' echo "===>>> +IGNOREME file is present for $1" echo '' + get_answer_g n y "===>>> Update ${1}${update_to}? y/n" + + case "$?" in + 1) INTERACTIVE_YES="${INTERACTIVE_YES}${1}:" ;; + 0) INTERACTIVE_NO="${INTERACTIVE_NO}${1}:" ; return 1 ;; + esac + else + get_answer_g y n "===>>> Update ${1}${update_to}? y/n" + + case "$?" in + 0) INTERACTIVE_YES="${INTERACTIVE_YES}${1}:" ;; + 1) INTERACTIVE_NO="${INTERACTIVE_NO}${1}:" ; return 1 ;; + esac fi - get_answer_g y n "===>>> Update ${1}${update_to}? y/n" - case "$?" in - 0) INTERACTIVE_YES="${INTERACTIVE_YES}${1}:" ;; - 1) INTERACTIVE_NO="${INTERACTIVE_NO}${1}:" ; return 1 ;; - esac - return 0 } check_exclude () { @@ -3901,9 +3912,8 @@ fi if [ -n "$use_package" ]; then if grep -q DEPORIGIN $pdb/$new_port/+CONTENTS; then - echo "===>>> Updating dependencies for $new_port to match installed versions" - update_contents $pdb/$new_port/+CONTENTS - echo '' + echo -e "===>>> Updating dependencies for $new_port to match installed versions\n" + update_contents $pdb/$new_port/+CONTENTS ; pm_v while read atc s; do case "$atc" in @@ -3914,7 +3924,8 @@ if [ -n "$use_package" ]; then unset pkgdep ;; esac done < $pdb/$new_port/+CONTENTS - unset atc s ; pm_v + [ -n "$needws" ] && { pm_v; unset needws; } + unset atc s fi fi @@ -3942,19 +3953,22 @@ if [ -s "$grep_deps" ]; then dp_cont=$pdb/$d_port/+CONTENTS [ -e "$dp_cont" ] || continue - if [ -n "$ro_opd" ]; then - grep -ql "DEPORIGIN:$ro_opd$" $dp_cont && - update_contents $dp_cont $portdir $new_port $ro_opd + if [ -n "$ro_opd" ] && grep -ql "DEPORIGIN:$ro_opd$" $dp_cont; then + update_contents $dp_cont $portdir $new_port $ro_opd + needws=needws fi # Do this one last so it can get deleted as a duplicate # if ro_opd is present. if grep -ql "DEPORIGIN:$portdir$" $dp_cont; then update_contents $dp_cont $portdir $new_port + needws=needws fi done < $grep_deps - unset d_port dp_cont do_update + [ -n "$needws" ] && pm_v + unset d_port dp_cont do_update needws - update_required_by $new_port ; pm_v + update_required_by $new_port + [ -n "$needws" ] && { pm_v; unset needws; } fi if [ -n "$upg_port" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207060009.q6609Qg9027699>