portmaster 1.21 - "cannot create" messages

[Doug Barton]

Ok, I think I found the problem, please try the attached patch.

Doug

-- 

     This .signature sanitized for your protection
-------------- next part --------------
--- portmaster	2007/10/07 07:00:12	1.189
+++ portmaster	2007/10/11 16:26:03
@@ -1106,7 +1106,7 @@
 }
 
 delete_dist_list () {
-	unlink $dist_list
+	test -e "$dist_list" && unlink $dist_list
 	rmdir ${dist_list%/distfiles} 2>/dev/null
 }
 
@@ -1851,17 +1851,18 @@
 	touch $pdb/$new_port/PM_UPGRADE_DONE_FLAG
 fi
 
-# Make sure any new distfiles get added to the list
-cd $pd/$portdir 2>/dev/null ||
-    fail "Cannot cd to $pd/$portdir for distfile update"
-distinfo=`make $PM_MAKE_ARGS -V MD5_FILE`
-if [ -s "$distinfo" ]; then
-	grep '^MD5' $distinfo | while read disc1 file disc2; do
-		echo $file >> $DI_FILES
-	done
-fi
-
+# XXX
 if [ -z "$DONT_SCRUB_DISTFILES" ]; then
+	# Make sure any new distfiles get added to the list
+	cd $pd/$portdir 2>/dev/null ||
+	    fail "Cannot cd to $pd/$portdir for distfile update"
+	distinfo=`make $PM_MAKE_ARGS -V MD5_FILE`
+	if [ -s "$distinfo" ]; then
+		grep '^MD5' $distinfo | while read disc1 file disc2; do
+			echo $file >> $DI_FILES
+		done
+	fi
+
 	if [ -z "$oldportdir" ]; then
 		delete_stale_distfiles
 	else