Ticket #13458: patch-macports-state-13458.diff

src/port1.0/portmain.tcl

@@ -38 +38 @@
 
 set org.macports.main [target_new org.macports.main main]
 target_provides ${org.macports.main} main
+target_state ${org.macports.main} no
 
 # define options
 options prefix name version revision epoch categories maintainers

src/port1.0/portlint.tcl

@@ -7 +7 @@
 
 set org.macports.lint [target_new org.macports.lint lint_main]
 target_runtype ${org.macports.lint} always
+target_state ${org.macports.lint} no
 target_provides ${org.macports.lint} lint
 target_requires ${org.macports.lint} main
 target_prerun ${org.macports.lint} lint_start

src/port1.0/portutil.tcl

@@ -1038 +1038 @@
     set result 0
     set skipped 0
     set procedure [ditem_key $ditem procedure]
+            
+    if {[ditem_key $ditem state] != "no"} {
+        set target_state_fd [open_statefile]
+    }
+        
     if {$procedure != ""} {
         set name [ditem_key $ditem name]
     
@@ -1048 +1053 @@
         if {$result == 0} {
             # Skip the step if required and explain why through ui_debug.
             # 1st case: the step was already done (as mentioned in the state file)
-            if {[check_statefile target $name $target_state_fd]} {
+            if {[ditem_key $ditem state] != "no"
+                    && [check_statefile target $name $target_state_fd]} {
                 ui_debug "Skipping completed $name ($portname)"
                 set skipped 1
             # 2nd case: the step is not to always be performed
@@ -1233 +1239 @@
         set result 1
     }
     
+    if {[ditem_key $ditem state] != "no"} {
+        close $target_state_fd
+    }
+
     return $result
 }
 
@@ -1285 +1295 @@
         }
     }
     
-    # Restore the state from a previous run.
-    set target_state_fd [open_statefile]
-    
     set dlist [dlist_eval $dlist "" target_run]
     
     if {[llength $dlist] > 0} {
@@ -1302 +1309 @@
         set result 0
     }
     
-    close $target_state_fd
     return $result
 }
 
@@ -1564 +1570 @@
     # - Skip this test if the statefile is empty.
     # - Skip this test if performing a clean or submit.
     # - Skip this test if ports_force was specified.
-    
-    if { [lsearch "clean submit" $target] < 0 && 
+   
+    # TODO: Don't hardcode this list of targets here,
+    #       check for [ditem_key $mport state] == "no" somewhere else instead
+    if { [lsearch "clean submit lint livecheck" $target] < 0 &&
         !([info exists ports_force] && $ports_force == "yes")} {
         
         set state_fd [open_statefile]