From owner-svn-src-user@FreeBSD.ORG Sun Jul 18 04:27:39 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA6AC106564A; Sun, 18 Jul 2010 04:27:39 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BA3448FC0C; Sun, 18 Jul 2010 04:27:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6I4RdYe040685; Sun, 18 Jul 2010 04:27:39 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6I4RdLA040683; Sun, 18 Jul 2010 04:27:39 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007180427.o6I4RdLA040683@svn.freebsd.org> From: Doug Barton Date: Sun, 18 Jul 2010 04:27:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210202 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2010 04:27:39 -0000 Author: dougb Date: Sun Jul 18 04:27:39 2010 New Revision: 210202 URL: http://svn.freebsd.org/changeset/base/210202 Log: 1. Use nice for the make commands that actually build stuff 2. Improve the the messages for fetching and updating INDEX 3. Add some whitespace in checkdepends() after removing stale data 4. If we're doing -F don't bother to initialize $PACKAGES Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Jul 18 00:24:01 2010 (r210201) +++ user/dougb/portmaster/portmaster Sun Jul 18 04:27:39 2010 (r210202) @@ -369,7 +369,7 @@ pm_cd_pd () { builtin cd $pd/$1 2>/dev/ pm_kill () { /bin/kill $* >/dev/null 2>/dev/null; } pm_make () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; unset -v MASTER_RB_LIST CONFIG_SEEN_LIST; - /usr/bin/make $PM_MAKE_ARGS $*; ); } + nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_make_b () { /usr/bin/make $PM_MAKE_ARGS BEFOREPORTMK=bpm $*; } pm_mktemp () { /usr/bin/mktemp -t f-${PM_PARENT_PID}-$1 || fail "mktemp for $1 failed"; } @@ -385,7 +385,7 @@ pm_install_s () { $PM_SU_CMD /usr/b -g wheel -m 644 $1 $2; } pm_make_s () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; unset -v MASTER_RB_LIST CONFIG_SEEN_LIST; - $PM_SU_CMD /usr/bin/make $PM_MAKE_ARGS $*; ); } + $PM_SU_CMD nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_mkdir_s () { $PM_SU_CMD /bin/mkdir -p $1; } pm_pkg_delete_s () { $PM_SU_CMD /usr/sbin/pkg_delete $*; } pm_rm_s () { $PM_SU_CMD /bin/rm $*; } @@ -532,11 +532,12 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then $index_fetch 2>/dev/null && do_index_fetch=no_index_fetch; } [ "$do_index_fetch" = yes_index_fetch ] && { - pm_sv 'Updating INDEX file'; $PM_SU_CMD $index_fetch; } + pm_sv 'Fetching new INDEX file'; $PM_SU_CMD $index_fetch; } if [ ${index_time:-0} -ne `stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` ]; then temp_index=`pm_mktemp index` bunzip2 < ${PM_INDEX}.bz2 > $temp_index + pm_sv 'Installing new INDEX file' pm_install_s $temp_index $PM_INDEX unlink $temp_index unset temp_index @@ -724,10 +725,11 @@ IFS=' echo -n " ===>>> Delete this dependency data? y/n [n] " read answer case "$answer" in - [yY]) unset prev_line line ; continue ;; + [yY]) unset prev_line line ; echo '' ; continue ;; esac else echo " ===>>> Try ${0##*/} --check-depends" + echo '' fi fi @@ -2531,7 +2533,7 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S [ -z "$NO_BACKUP" ] && init_packages [ -z "$NO_BACKUP" -a -z "$BACKUP" ] && export NB_DELETE - if [ -n "$MAKE_PACKAGE" ]; then + if [ -n "$MAKE_PACKAGE" -a -z "$FETCH_ONLY" ]; then init_packages_var if [ ! -d "$PACKAGES" ]; then