Date: Sat, 9 Apr 2011 06:01:37 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r220464 - user/dougb/portmaster Message-ID: <201104090601.p3961bLh003033@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sat Apr 9 06:01:37 2011 New Revision: 220464 URL: http://svn.freebsd.org/changeset/base/220464 Log: Add some code to --check-depends to explicitly handle --index-only. It worked before by ignoring the origin test if there was no ports directory, but failed if --index-only was also used. This is better both because it doesn't fail with --index-only, but also because it now uses the index to validate $origin. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Apr 9 02:22:49 2011 (r220463) +++ user/dougb/portmaster/portmaster Sat Apr 9 06:01:37 2011 (r220464) @@ -1386,9 +1386,17 @@ IFS=' origin=`origin_from_pdb $iport` || continue - if [ -n "$pd" ] && [ ! -d "$pd/$origin" ]; then + if [ -z "$PM_INDEX_ONLY" ]; then + if [ -n "$pd" ] && [ ! -d "$pd/$origin" ]; then + missing=yes + fi + else + parse_index $origin name >/dev/null || missing=yes + fi + if [ -n "$missing" ]; then echo " ===>>> $pd/$origin does not exist" echo " ===>>> This port should probably be updated" + unset missing continue fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104090601.p3961bLh003033>