[64517] trunk/base/src

[jmr at macports.org]

Revision: 64517
          http://trac.macports.org/changeset/64517
Author:   jmr at macports.org
Date:     2010-03-07 20:06:03 -0800 (Sun, 07 Mar 2010)
Log Message:
-----------
record in registry whether ports were explicitly requested (#15260)

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portinstall.tcl
    trunk/base/src/registry2.0/entryobj.c

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-03-08 03:53:59 UTC (rev 64516)
+++ trunk/base/src/macports1.0/macports.tcl	2010-03-08 04:06:03 UTC (rev 64517)
@@ -1242,6 +1242,9 @@
     } else {
         set portdir ""
     }
+    if {![info exists options_array(ports_requested)]} {
+        lappend options ports_requested 0
+    }
 
     set portpath [macports::getportdir $porturl $portdir]
     ui_debug "Changing to port directory: $portpath"
@@ -1558,18 +1561,23 @@
         }
     }
 
-    # If we're doing an install, check if we should clean after
-    set clean 0
-    if {[string equal ${macports::portautoclean} "yes"] && [string equal $target "install"] } {
-        set clean 1
+    if {[string equal $target "install"]} {
+        # mark port as explicitly requested
+        $workername eval set user_options(ports_requested) 1
+        
+        # If we're doing an install, check if we should clean after
+        set clean 0
+        if {[string equal ${macports::portautoclean} "yes"]} {
+            set clean 1
+        }
+    
+        # If we're doing image installs, then we should activate after install
+        # xxx: This isn't pretty
+        if { [string equal ${macports::registry.installtype} "image"] } {
+            set target activate
+        }
     }
 
-    # If we're doing image installs, then we should activate after install
-    # xxx: This isn't pretty
-    if { [string equal ${macports::registry.installtype} "image"] && [string equal $target "install"] } {
-        set target activate
-    }
-
     # Build this port with the specified target
     set result [$workername eval eval_targets $target]
 

Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl	2010-03-08 03:53:59 UTC (rev 64516)
+++ trunk/base/src/port1.0/portinstall.tcl	2010-03-08 04:06:03 UTC (rev 64517)
@@ -141,7 +141,7 @@
 proc portinstall::install_main {args} {
     global name version portpath categories description long_description \
     homepage depends_run installPlist package-install uninstall workdir \
-    worksrcdir UI_PREFIX destroot revision maintainers ports_force \
+    worksrcdir UI_PREFIX destroot revision maintainers user_options \
     portvariants default_variants targets depends_lib PortInfo epoch license \
     registry.installtype registry.path registry.format \
     os.arch configure.build_arch configure.universal_archs supported_archs \
@@ -167,6 +167,7 @@
 
             set regref [registry::entry create $name $version $revision $portvariants $epoch]
 
+            $regref requested $user_options(ports_requested)
             $regref os_platform ${os.platform}
             $regref os_major ${os.major}
             if {$supported_archs == "noarch"} {
@@ -223,6 +224,7 @@
         # Install the files
         directory_dig ${destroot} ${destroot} ${imagedir}
 
+        registry_prop_store $regref requested $user_options(ports_requested)
         registry_prop_store $regref categories $categories
 
         registry_prop_store $regref os_platform ${os.platform}

Modified: trunk/base/src/registry2.0/entryobj.c
===================================================================
--- trunk/base/src/registry2.0/entryobj.c	2010-03-08 03:53:59 UTC (rev 64516)
+++ trunk/base/src/registry2.0/entryobj.c	2010-03-08 04:06:03 UTC (rev 64517)
@@ -55,6 +55,7 @@
     "archs",
     "os_platform",
     "os_major",
+    "requested",
     NULL
 };
 
@@ -378,6 +379,7 @@
     { "archs", entry_obj_prop },
     { "os_platform", entry_obj_prop },
     { "os_major", entry_obj_prop },
+    { "requested", entry_obj_prop },
     /* filemap */
     { "map", entry_obj_filemap },
     { "unmap", entry_obj_filemap },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100307/436a7651/attachment.html>