From owner-svn-src-user@FreeBSD.ORG Fri May 7 21:48:52 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E29131065677; Fri, 7 May 2010 21:48:51 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id D310B8FC08; Fri, 7 May 2010 21:48:51 +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 o47LmpeK019995; Fri, 7 May 2010 21:48:51 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o47Lmpvc019993; Fri, 7 May 2010 21:48:51 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005072148.o47Lmpvc019993@svn.freebsd.org> From: Doug Barton Date: Fri, 7 May 2010 21:48:51 +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: r207760 - 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: Fri, 07 May 2010 21:48:52 -0000 Author: dougb Date: Fri May 7 21:48:51 2010 New Revision: 207760 URL: http://svn.freebsd.org/changeset/base/207760 Log: Add a --packages-local option for those who wish to use only local packages, and never attempt to fetch from a remote site. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri May 7 21:06:52 2010 (r207759) +++ user/dougb/portmaster/portmaster Fri May 7 21:48:51 2010 (r207760) @@ -249,7 +249,7 @@ usage () { echo "Common flags: [--force-config] [-CGHKgntvw B|b f|i D|d]" echo " [[[--packages|-P]|[--packages-only|-PP]] | [--packages-build]]" echo " [--packages-if-newer] [--delete-build-only] [--always-fetch]" - echo " [--local-packagedir=] [--delete-packages]" + echo " [--local-packagedir=] [--packages-local] [--delete-packages]" echo " [--no-confirm] [--no-term-title] [--no-index-fetch]" echo " [--index|--index-first|--index-only]" echo " [-m ] [-x ]" @@ -336,6 +336,7 @@ usage () { echo '--always-fetch fetch package even if it already exists locally' echo '--local-packagedir= where local packages can be found,' echo ' will fall back to fetching if no local version exists' + echo '--packages-local use packages from --local-packagedir only' echo '--delete-packages after installing from a package, delete it' echo '' echo '-l list installed ports by category' @@ -409,6 +410,8 @@ e2="The --packages-build option and the build) case "$PM_PACKAGES" in first|only) fail $e2 ;; esac ;; newer) [ -z "$PM_PACKAGES" -a -z "$PM_PACKAGES_BUILD" ] && { PM_PACKAGES=newer ; export PM_PACKAGES; } ;; + local) [ -z "$PM_PACKAGES" -a -z "$PM_PACKAGES_BUILD" ] && { + PM_PACKAGES=local ; export PM_PACKAGES; } ;; esac } @@ -439,6 +442,9 @@ for var in "$@" ; do --packages-if-newer) packages_init newer PM_PACKAGES_NEWER=pmp_newer export PM_PACKAGES_NEWER ;; + --packages-local) packages_init local + PM_PACKAGES_LOCAL=pmp_local + export PM_PACKAGES_LOCAL ;; --always-fetch) PM_ALWAYS_FETCH=pm_always_fetch export PM_ALWAYS_FETCH ;; --local-packagedir=*) LOCAL_PACKAGEDIR=${var#--local-packagedir=} @@ -3003,7 +3009,7 @@ fetch_package () { $PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; } fi } - if [ -z "$PACKAGESITE" ]; then + if [ -z "$PACKAGESITE" -a -z "$PM_PACKAGES_LOCAL" ]; then release=`uname -r` case "$release" in @@ -3049,7 +3055,7 @@ fetch_package () { fi fi - if [ -z "$latest_pv" ]; then + if [ -z "$latest_pv" -a -z "$PM_PACKAGES_LOCAL" ]; then dirlist=`echo ${TMPDIR}/f-${PM_PARENT_PID}-dl-${portdir%/*}*` if [ ! -r "$dirlist" ]; then pm_unlink $dirlist # JIC @@ -3066,7 +3072,7 @@ fetch_package () { fi unset dirlist s - if [ -z "$latest_pv" ]; then + if [ -z "$latest_pv" -a -z "$PM_PACKAGES_LOCAL" ]; then fetch_package $new_port try if [ $? -eq 0 ]; then latest_pv=$new_port @@ -3077,7 +3083,13 @@ fetch_package () { if [ -z "$latest_pv" ]; then echo "===>>> Package and/or archive not found at:" - echo "${sitepath}" + if [ -n "$LOCAL_PACKAGEDIR" ]; then + echo " $LOCAL_PACKAGEDIR" + if [ -z "$PM_PACKAGES_LOCAL" ]; then + echo ' or' + fi + fi + [ -z "$PM_PACKAGES_LOCAL" ] && echo " ${sitepath}" echo '' echo " Check the pkg_add(1) man page for information" echo " on setting the PACKAGESITE environment variable" @@ -3170,6 +3182,7 @@ if [ -z "$use_package" ]; then fi fi + [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir [ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd || fail 'make clean failed'; echo ''; }