Date: Sun, 1 Aug 2010 06:36:41 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r210713 - user/dougb/portmaster Message-ID: <201008010636.o716af00020537@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sun Aug 1 06:36:41 2010 New Revision: 210713 URL: http://svn.freebsd.org/changeset/base/210713 Log: Add $pd to $origin in clean_distinfos(). We're duplicating the same new code that I added to clean_distinfos_all() to optimize finding the distinfo file, but in the former ORIGIN comes from $pkg/+CONTENTS, which does not include $pd. This meant that --clean-distfiles[-all] was deleting every file. (Oops) Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Aug 1 02:27:16 2010 (r210712) +++ user/dougb/portmaster/portmaster Sun Aug 1 06:36:41 2010 (r210713) @@ -881,6 +881,8 @@ read_distinfos () { origin=$moved_npd fi + origin="${pd}/${origin}" + if [ -s "${origin}/distinfo" ]; then distinfo="${origin}/distinfo" else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008010636.o716af00020537>