From owner-cvs-all@FreeBSD.ORG Tue May 11 01:20:46 2010 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D228D106566C; Tue, 11 May 2010 01:20:46 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-qy0-f181.google.com (mail-qy0-f181.google.com [209.85.221.181]) by mx1.freebsd.org (Postfix) with ESMTP id 468568FC08; Tue, 11 May 2010 01:20:45 +0000 (UTC) Received: by qyk11 with SMTP id 11so6506602qyk.13 for ; Mon, 10 May 2010 18:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:references:message-id:from:to :in-reply-to:content-type:content-transfer-encoding:x-mailer :mime-version:subject:date:cc; bh=2xoHrKX96AjAit+Ab/elhZpfeAijIrwO05cv2BL3pMI=; b=XHYgU0yx3G9+GV98gcCbOgI5aZoXbWr/CcLjUzeISY3qoWpMMAPr9UJOSWnLKlVTSF aISYkLmtYB+qdWokzi9gTdxUbTkPYvHD3fGcD9t5OeFUkkRdd6X2k1Zb+1RJtPgcixgZ X6DfRUZ3/n3LM+Z9e8BwQCzTGTPP7JKCAPY+s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=references:message-id:from:to:in-reply-to:content-type :content-transfer-encoding:x-mailer:mime-version:subject:date:cc; b=seY3dJZPwuSQDkGteuMweSq0p09TpVezuZwBGLEjNzz9FRqLNwFevx8TcXGu7FaFdx mrQHHpZrco3ePiSZS2hFKrq7Jcyx8ykbiQo59sw3MMUcSrHX6MbYsQbhYioC8E4bJySS cKgSNZuIhVx+P0RE6fWKclO9ROaDb9tc40d34= Received: by 10.229.181.203 with SMTP id bz11mr4135386qcb.94.1273540845387; Mon, 10 May 2010 18:20:45 -0700 (PDT) Received: from [10.17.178.28] (mobile-166-137-136-184.mycingular.net [166.137.136.184]) by mx.google.com with ESMTPS id x34sm4428990qce.3.2010.05.10.18.20.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 10 May 2010 18:20:44 -0700 (PDT) References: <201005102323.o4ANNjhS089001@repoman.freebsd.org> Message-Id: <6324EA09-E6E9-4374-A57C-3A48326A5F4D@gmail.com> From: Garrett Cooper To: Doug Barton In-Reply-To: <201005102323.o4ANNjhS089001@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Mailer: iPhone Mail (7E18) Mime-Version: 1.0 (iPhone Mail 7E18) Date: Mon, 10 May 2010 21:20:31 -0400 Cc: "cvs-ports@FreeBSD.org" , "cvs-all@FreeBSD.org" , "ports-committers@FreeBSD.org" Subject: Re: cvs commit: ports/ports-mgmt/portmaster/files portmaster.sh.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2010 01:20:47 -0000 On May 10, 2010, at 7:23 PM, Doug Barton wrote: > dougb 2010-05-10 23:23:45 UTC > > FreeBSD ports repository > > Modified files: > ports-mgmt/portmaster/files portmaster.sh.in > Log: > New Feature > =========== > Add a --packages-local option for those who wish to use only local > packages, and never attempt to fetch from a remote site. > > Bug Fix > ======= > Fix a braino for --index-first and --index-only: > The cross-checking of the command line options needs to happen before > the environment variables are set. > > Cleanups And Optimizations > ========================== > 1. LOCALBASE_COMPAT is only ever used in combination with /pkg at the > end, so fold that into the variable to start with. > 2. Indicate to the user that -p is deprecated > 3. Allow setting of DISTDIR directly in .portmasterrc like the other > widely used vars. This entails the following: > a. Capitalize distdir every place that it's used. > b. Add to the list of --options to check which mean we don't even > have to try to set it. This saves us a call to make(1). > c. Don't set it to / if DISTDIR is empty, which makes error > checking > later on easier. > d. Mark DISTDIR (and related vars) global in a few more functions > to make it consistent. > 4. Move the test for version > 6.4 first in the list, no point in > processing a bunch of stuff only to bail out later. > 5. Unset the test_command_line function when we're done using it > 6. Be smarter about whether or not to use $PM_SU_CMD to fetch the > INDEX.bz2 > 7. Improve cross-option error checking for the --packages* options > > Revision Changes Path > 2.26 +99 -65 ports/ports-mgmt/portmaster/files/ > portmaster.sh.in How about having a precedence list for download sites? Works well for fetching ports distfiles at least. If someone doesn't want to fetch from nonlocal mirrors they could just explicitly note the download mirrors. And if someone wanted to place priority on the local mirror they could accumulate the value appropriately with sh syntax. Just a thought. I like the functionality, but this seems like a better overall solution. Cheers, -Garrett