From owner-svn-src-user@FreeBSD.ORG Sun Feb 14 07:20:58 2010 Return-Path: <owner-svn-src-user@FreeBSD.ORG> 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 9B8B41065672; Sun, 14 Feb 2010 07:20:58 +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 8076E8FC08; Sun, 14 Feb 2010 07:20:58 +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 o1E7KwBc099170; Sun, 14 Feb 2010 07:20:58 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1E7Kwmr099168; Sun, 14 Feb 2010 07:20:58 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201002140720.o1E7Kwmr099168@svn.freebsd.org> From: Doug Barton <dougb@FreeBSD.org> Date: Sun, 14 Feb 2010 07:20:58 +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: r203854 - 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" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 14 Feb 2010 07:20:58 -0000 Author: dougb Date: Sun Feb 14 07:20:58 2010 New Revision: 203854 URL: http://svn.freebsd.org/changeset/base/203854 Log: Correct the error message output for the recently introduced pm_cd_pd() First step towards INDEX file support, downloading and installing Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Feb 14 05:44:06 2010 (r203853) +++ user/dougb/portmaster/portmaster Sun Feb 14 07:20:58 2010 (r203854) @@ -246,6 +246,7 @@ usage () { echo " [[--packages|--packages-only] [-P|-PP] | [--packages-build]]" echo " [--packages-if-newer] [--delete-build-only] [--always-fetch]" echo " [--local-packagedir=<path>] [--no-confirm] [--no-term-title]" + echo " [--index]" echo " [-m <arguments for make>] [-x <glob pattern to exclude from building>]" echo "${0##*/} [Common flags] <full name of port directory in $pdb>" echo "${0##*/} [Common flags] <full path to $pd/foo/bar>" @@ -304,6 +305,7 @@ usage () { echo '--no-confirm do not ask user to confirm list of ports to be' echo ' installed and/or updated before proceeding' echo '--no-term-title do not update the xterm title bar' + echo "--index use $pd/INDEX-[6-9] to check if a port is out of date" echo '' echo '--show-work list what ports are and would be installed' echo '' @@ -350,7 +352,7 @@ usage () { pm_cd () { builtin cd $1 2>/dev/null || return 1; } pm_cd_pd () { builtin cd $pd/$1 2>/dev/null || - fail "Cannot cd to port directory: $pd/$origin"; } + fail "Cannot cd to port directory: $pd/$1"; } pm_kill () { /bin/kill $* >/dev/null 2>/dev/null; } pm_make () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH; unset -v MASTER_RB_LIST CONFIG_SEEN_LIST; @@ -446,6 +448,7 @@ for var in "$@" ; do export PM_NO_CONFIRM ;; --no-term-title) PM_NO_TERM_TITLE=pm_no_term_title export PM_NO_TERM_TITLE ;; + --index) PM_INDEX=pm_index ; export PM_INDEX ;; --help) usage 0 ;; --version) version ; exit 0 ;; --clean-distfiles) CLEAN_DISTFILES=clean_distfiles ;; @@ -2211,6 +2214,41 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S export DI_FILES=`pm_mktemp DI-FILES` fi +# XXX + if [ -n "$PM_INDEX" ]; then + pm_cd_pd + if [ -z "$FETCHINDEX" ]; then + FETCHINDEX=`pm_make_b -V FETCHINDEX` + [ -n "$FETCHINDEX" ] || + fail 'The value of FETCHINDEX cannot be empty' + fi + if [ -z "$MASTER_SITE_INDEX" ]; then + MASTER_SITE_INDEX=`pm_make_b -V MASTER_SITE_INDEX` + [ -n "$MASTER_SITE_INDEX" ] || + fail 'The value of MASTER_SITE_INDEX cannot be empty' + fi + if [ -z "$INDEXDIR" ]; then + INDEXDIR=`pm_make_b -V INDEXDIR` + [ -n "$INDEXDIR" ] || + fail 'The value of INDEXDIR cannot be empty' + fi + if [ -z "$INDEXFILE" ]; then + INDEXFILE=`pm_make_b -V INDEXFILE` + [ -n "$INDEXFILE" ] || + fail 'The value of INDEXFILE cannot be empty' + fi + + i="${INDEXDIR}/${INDEXFILE}" + + [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Fetching INDEX file" + $PM_SU_CMD $FETCHINDEX ${i}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 + temp_index=`pm_mktemp index` + bunzip2 < ${i}.bz2 > $temp_index + pm_install_s $temp_index $i + + unset i temp_index + fi + if [ $# -gt 1 -a -z "$REPLACE_ORIGIN" ]; then multiport $@ fi