Date: Mon, 29 Mar 2010 07:54:20 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r205829 - user/dougb/portmaster Message-ID: <201003290754.o2T7sKvj090563@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Mon Mar 29 07:54:20 2010 New Revision: 205829 URL: http://svn.freebsd.org/changeset/base/205829 Log: Minor updates from ports version 2.20: 1. Add a 'sleep 5' to the warning about /etc/portmaster.rc 2. Don't init_packages() if -F 3. In the INIT phase revert the change to init_packages_var 4. Add one more missing $PM_SU_CMD to the package fetch Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Mar 29 07:09:27 2010 (r205828) +++ user/dougb/portmaster/portmaster Mon Mar 29 07:54:20 2010 (r205829) @@ -28,7 +28,7 @@ if [ -z "$PM_PARENT_PID" ]; then echo ' Your portmaster.rc is in /etc, however support for the file in this' echo ' location is deprecated, and will be removed in a future version.' echo '' ; echo ' The proper location for this file is /usr/local/etc' - echo '' ; . /etc/portmaster.rc + echo '' ; sleep 5 ; . /etc/portmaster.rc fi [ -r /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc @@ -1267,6 +1267,8 @@ fail 'The value of PACKAGES cannot be em init_packages () { # Global: pbu + [ -n "$FETCH_ONLY" ] && return + init_packages_var [ -n "$NO_BACKUP" ] && return @@ -2393,7 +2395,7 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S fi fi - [ -n "$NO_BACKUP" -a -z "$MAKE_PACKAGE" ] || init_packages_var + [ -n "$NO_BACKUP" -a -z "$MAKE_PACKAGE" ] || init_packages [ -z "$NO_BACKUP" -a -z "$BACKUP" ] && export NB_DELETE # Set the file name here so it's visible to the children @@ -2897,7 +2899,7 @@ fetch_package () { [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Fetching ${1}.tbz" $PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null || { pm_unlink_s ${ppd}/${1}.tbz; - fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; } + $PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; } fi } if [ -z "$PACKAGESITE" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003290754.o2T7sKvj090563>