Changeset 2070 for trunk/base

Timestamp:

Feb 23, 2003, 7:18:42 AM (21 years ago)

Author:

kevin

Message:

Discard statefile if Portfile changed since last build.

File:

• trunk/base/src/port1.0/portutil.tcl (modified) (3 diffs)

trunk/base/src/port1.0/portutil.tcl

@@ -640 +640 @@
 # open file to store name of completed targets
 proc open_statefile {args} {
-    global workpath portname
+    global workpath portname portpath
     
     if ![file isdirectory $workpath ] {
@@ -647 +647 @@
     # flock Portfile
     set statefile [file join $workpath .darwinports.${portname}.state]
-    if {[file exists $statefile] && ![file writable $statefile]} {
-        return -code error "$statefile is not writable - check permission on port directory"
-    }
+    if {[file exists $statefile]} {
+                if {![file writable $statefile]} {
+                        return -code error "$statefile is not writable - check permission on port directory"
+                }
+                if {[file mtime $statefile] < [file mtime ${portpath}/Portfile]} {
+                        ui_msg "Portfile changed since last build; discarding previous state."
+                        file delete $statefile
+                }
+        }
+        
     set fd [open $statefile a+]
     if [catch {flock $fd -exclusive -noblock} result] {
@@ -669 +676 @@
 proc check_statefile {class name fd} {
     global portpath workdir
-    
+        
     seek $fd 0
     while {[gets $fd line] >= 0} {