Date: Tue, 2 Nov 2010 19:33:45 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r214683 - user/dougb/portmaster Message-ID: <201011021933.oA2JXjRk079143@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Tue Nov 2 19:33:45 2010 New Revision: 214683 URL: http://svn.freebsd.org/changeset/base/214683 Log: For -a change to using PM_NEEDS_UPDATE for keeping track of things that have already been updated as dependencies of other ports that needed updating. In order to do the above effectively we need to preserve the (moderately hackish) space prepended to the list. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Tue Nov 2 18:34:31 2010 (r214682) +++ user/dougb/portmaster/portmaster Tue Nov 2 19:33:45 2010 (r214683) @@ -242,7 +242,7 @@ safe_exit () { pnu_temp="${pnu_temp}${i} " done - PM_NEEDS_UPDATE="$pnu_temp" + PM_NEEDS_UPDATE=" ${pnu_temp}" else # Do these here so +IGNOREME can modify them echo "num_of_deps='$num_of_deps'" >> $IPC_SAVE @@ -2467,8 +2467,8 @@ post_first_pass () { term_printf fi - PM_NEEDS_UPDATE=${PM_NEEDS_UPDATE# } - [ -z "$PM_NEEDS_UPDATE" ] && return + # Only when -a or multi and user said no to update +IGNOREME(s) + [ "$PM_NEEDS_UPDATE" = ' ' ] && return action=build if [ "$PM_PACKAGES" = only ]; then @@ -2834,7 +2834,12 @@ all_first_pass () { unset roots trunks branches leaves - for origin in $PM_NEEDS_UPDATE; do update_port $origin; done + for origin in $PM_NEEDS_UPDATE; do + case "$PM_NEEDS_UPDATE" in + *\ $origin\ *) update_port $origin ;; + '') continue ;; # Already updated as a dependency + esac + done echo "===>>> Update check of installed ports complete" ; echo '' safe_exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011021933.oA2JXjRk079143>