Date: Mon, 25 Oct 2010 19:56:02 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r214356 - user/dougb/portmaster Message-ID: <201010251956.o9PJu2TA075761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Mon Oct 25 19:56:02 2010 New Revision: 214356 URL: http://svn.freebsd.org/changeset/base/214356 Log: The BEFOREPORTMK trick no longer works to list MASTER_SITES for all ports so switch to the slightly slower but more reliable pm_make without it. This will solve the problem of portmaster not fetching all distfiles in the background. In the case statement to select the appropriate release for package fetching glob 9.0-CURRENT to handle snapshots as well. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Oct 25 19:43:22 2010 (r214355) +++ user/dougb/portmaster/portmaster Mon Oct 25 19:56:02 2010 (r214356) @@ -3006,7 +3006,7 @@ if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUIL [ "$$" -eq "$PM_PARENT_PID" -a -n "$DI_FILES" ] && (read_distinfos)& # Handle the problem of manual fetching - [ -z "$PM_PACKAGES" ] && master_sites=`pm_make_b -V MASTER_SITES` + [ -z "$PM_PACKAGES" ] && master_sites=`pm_make -V MASTER_SITES` if [ -n "$master_sites" ]; then # PATCHFILES may get added after the first pass, but we want to @@ -3225,7 +3225,7 @@ fetch_package () { release=packages-${release%%\.*}-stable ;; [678]\.[0-9]-RELEASE*) release=packages-${release%-RELEASE*}-release ;; - 9\.0-CURRENT) release=packages-9-current ;; + 9\.0-CURRENT*) release=packages-9-current ;; *RC[0-9]*) release=${release%-RC[0-9]} release=packages-${release}-release ;; *BETA[0-9]*) release=${release%-BETA[0-9]}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010251956.o9PJu2TA075761>