Ignore:
Timestamp:
Jun 12, 2010, 1:57:23 PM (7 years ago)
Author:
jmr@…
Message:

merge r68746, r68749 from trunk:

run activate target instead of install (#25218)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/release_1_9/base/src/macports1.0/macports.tcl

    r68698 r68752  
    16161616            set result [dlist_eval $dlist _mportactive [list _mportexec "activate"]]
    16171617        } else {
    1618             set result [dlist_eval $dlist _mportinstalled [list _mportexec "install"]]
     1618            set result [dlist_eval $dlist _mportinstalled [list _mportexec "activate"]]
    16191619        }
    16201620
     
    28522852                }
    28532853                # now install it
    2854                 if {[catch {set result [mportexec $workername install]} result]} {
     2854                if {[catch {set result [mportexec $workername activate]} result]} {
    28552855                    global errorInfo
    28562856                    ui_debug "$errorInfo"
     
    31923192        }
    31933193        ui_msg "Skipping activate $newname @${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) (dry run)"
    3194     } elseif {[catch {set result [mportexec $workername install]} result]} {
     3194    } elseif {[catch {set result [mportexec $workername activate]} result]} {
    31953195        global errorInfo
    31963196        ui_debug "$errorInfo"
Note: See TracChangeset for help on using the changeset viewer.