From owner-svn-src-user@FreeBSD.ORG Mon May 17 01:49:53 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 3A903106567F; Mon, 17 May 2010 01:49:53 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 114D08FC26; Mon, 17 May 2010 01:49:53 +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 o4H1nqJS079037; Mon, 17 May 2010 01:49:52 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4H1nq4c079035; Mon, 17 May 2010 01:49:52 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005170149.o4H1nq4c079035@svn.freebsd.org> From: Doug Barton Date: Mon, 17 May 2010 01:49:52 +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: r208178 - 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: Mon, 17 May 2010 01:49:53 -0000 Author: dougb Date: Mon May 17 01:49:52 2010 New Revision: 208178 URL: http://svn.freebsd.org/changeset/base/208178 Log: Add a little more white space after the user input for --check-port-dbdir Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon May 17 01:41:11 2010 (r208177) +++ user/dougb/portmaster/portmaster Mon May 17 01:49:52 2010 (r208178) @@ -1060,6 +1060,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then case "$answer" in [yY]) pm_rm_s -rf $dir ;; esac + echo '' ;; esac done From owner-svn-src-user@FreeBSD.ORG Mon May 17 02:11:04 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 67711106564A; Mon, 17 May 2010 02:11:04 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5776C8FC13; Mon, 17 May 2010 02:11:04 +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 o4H2B40E083824; Mon, 17 May 2010 02:11:04 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4H2B4SX083822; Mon, 17 May 2010 02:11:04 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005170211.o4H2B4SX083822@svn.freebsd.org> From: Doug Barton Date: Mon, 17 May 2010 02:11:03 +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: r208180 - 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: Mon, 17 May 2010 02:11:04 -0000 Author: dougb Date: Mon May 17 02:11:03 2010 New Revision: 208180 URL: http://svn.freebsd.org/changeset/base/208180 Log: Limit the scope of some of the variables related to fetching distfiles If a distfile has a / in the file name creation of the flag file for background fetching will fail, so swap that for a _ instead. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon May 17 02:01:22 2010 (r208179) +++ user/dougb/portmaster/portmaster Mon May 17 02:11:03 2010 (r208180) @@ -2811,6 +2811,8 @@ check_state || { # Do these things first time through, with or without 'make config' if [ -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then dofetch () { + local fetchlog allfiles + echo "===>>> Launching 'make checksum' for $portdir in background" fetchlog=`pm_mktemp fetchlog-${portdir#*/}` (pm_make -DBATCH checksum >> $fetchlog 2>&1 && { @@ -2836,8 +2838,8 @@ dofetch () { # Make sure that different ports using the same distfiles # do not clobber each other's fetchs for file in $distfiles; do - if ! ls ${TMPDIR}/f-${PM_PARENT_PID}-${file}-* >/dev/null 2>&1 - then + case "$file" in */*) file=`echo $file | sed s#/#_#g` ;; esac + if ! ls ${TMPDIR}/f-${PM_PARENT_PID}-${file}-* >/dev/null 2>&1; then pm_mktemp ${file}-${portdir#*/} >/dev/null else DONT_FETCH=dont_fetch @@ -2847,7 +2849,7 @@ dofetch () { [ -z "$DONT_FETCH" -a -n "$distfiles" ] && dofetch fi - unset master_sites + unset master_sites distfiles file DONT_FETCH if [ -z "$FETCH_ONLY" -a ! "$PM_PACKAGES" = only ]; then TESTINT=`grep -l ^IS_INTERACTIVE Makefile` @@ -2862,6 +2864,7 @@ dofetch () { echo -n "===>>> Press the [Enter] or [Return] key to continue " read DISCARD echo '' + unset TESTINT DISCARD fi fi fi # [ -z "$PM_INDEX_ONLY" ] From owner-svn-src-user@FreeBSD.ORG Mon May 17 02:44:52 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 3BDCA106566B; Mon, 17 May 2010 02:44:52 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2BF938FC12; Mon, 17 May 2010 02:44:52 +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 o4H2ip1g091381; Mon, 17 May 2010 02:44:51 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4H2ipiN091379; Mon, 17 May 2010 02:44:51 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005170244.o4H2ipiN091379@svn.freebsd.org> From: Doug Barton Date: Mon, 17 May 2010 02:44: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: r208182 - 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: Mon, 17 May 2010 02:44:52 -0000 Author: dougb Date: Mon May 17 02:44:51 2010 New Revision: 208182 URL: http://svn.freebsd.org/changeset/base/208182 Log: In iport_from_origin() if we don't find a match (which is normal for ports that are not yet installed) then return immediately. In check_for_updates() if a port has moved we should also check for an +IGNOREME file before forcing the update. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon May 17 02:20:24 2010 (r208181) +++ user/dougb/portmaster/portmaster Mon May 17 02:44:51 2010 (r208182) @@ -601,7 +601,7 @@ unset var newopts iport_from_origin () { local dir - dir=`grep -l "@comment ORIGIN:${1}$" $pdb/*/+CONTENTS` + dir=`grep -l "@comment ORIGIN:${1}$" $pdb/*/+CONTENTS` || return 1 # It should not happen that more than one port meets this # requirement, but it can if the pkg data is corrupted. @@ -1285,8 +1285,17 @@ check_for_updates () { elif [ -z "$do_update" -a -z "$skip" ]; then find_moved_port $origin $iport $nf - # If the port has moved, we have to update it, otherwise ignore - [ -n "$moved_npd" ] && do_update=do_update6 + # If the port has moved and no +IGNOREME, we have to update it + if [ -n "$moved_npd" ]; then + if [ ! -e "$pdb/$iport/+IGNOREME" ]; then + do_update=do_update_moved + else + echo " ===>>> Continuing due to $pdb/$iport/+IGNOREME" + echo '' + CUR_DEPS="${CUR_DEPS}${iport}:${origin}:" + return 0 + fi + fi fi if [ -z "$do_update" -a -n "$port_ver" ]; then