Changeset 68752


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

merge r68746, r68749 from trunk:

run activate target instead of install (#25218)

Location:
branches/release_1_9/base
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/release_1_9/base/portmgr/packaging/dpkgall.tcl

    r64641 r68752  
    691691
    692692        foreach port [get_required_ports] {
    693                 if {[catch {do_portexec $port [array get options] [array get variants] install} result]} {
     693                if {[catch {do_portexec $port [array get options] [array get variants] activate} result]} {
    694694                        global errorInfo
    695695                        ui_debug "$errorInfo"
     
    746746        }
    747747
    748         if {[catch {set result [mportexec $workername install]} result] || $result == 1} {
     748        if {[catch {set result [mportexec $workername $target]} result] || $result == 1} {
    749749
    750750                # Close the port
  • branches/release_1_9/base/portmgr/packaging/rpmall.tcl

    r51780 r68752  
    458458                                exit 1
    459459                        }
    460                         if {[catch {set result [mportexec $workername install]} result] ||
     460                        if {[catch {set result [mportexec $workername activate]} result] ||
    461461                                $result == 1} {
    462462                                global errorInfo
  • 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.