svn commit: r210713 - user/dougb/portmaster

Doug Barton dougb at FreeBSD.org
Sun Aug 1 06:36:41 UTC 2010


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


More information about the svn-src-user mailing list