[53707] trunk/base/src/port1.0/portutil.tcl

[jmr at macports.org]

Revision: 53707
          http://trac.macports.org/changeset/53707
Author:   jmr at macports.org
Date:     2009-07-12 06:56:36 -0700 (Sun, 12 Jul 2009)
Log Message:
-----------
In dry-run mode, skip deleting the workpath when the Portfile has changed (#19908)

Modified Paths:
--------------
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2009-07-12 13:28:47 UTC (rev 53706)
+++ trunk/base/src/port1.0/portutil.tcl	2009-07-12 13:56:36 UTC (rev 53707)
@@ -1573,10 +1573,13 @@
             return -code error "$statefile is not writable - check permission on port directory"
         }
         if {!([info exists ports_ignore_older] && $ports_ignore_older == "yes") && [file mtime $statefile] < [file mtime ${portpath}/Portfile]} {
-            ui_msg "Portfile changed since last build; discarding previous state."
-            #file delete $statefile
-            delete [file join $workpath]
-            file mkdir [file join $workpath]
+            if {!([info exists ports_dryrun] && $ports_dryrun == "yes")} {
+                ui_msg "Portfile changed since last build; discarding previous state."
+                delete [file join $workpath]
+                file mkdir [file join $workpath]
+            } else {
+                ui_msg "Portfile changed since last build but not discarding previous state (dry run)"
+            }
         }
     }
     chownAsRoot $workpath
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090712/4befd392/attachment.html>