Changeset 124047


Ignore:
Timestamp:
Aug 17, 2014, 7:09:55 PM (5 years ago)
Author:
ksammons@…
Message:

Merge from gsoc14-cleanup. See https://trac.macports.org/wiki/SummerOfCode2014#cleanup for details.

Location:
trunk/base
Files:
5 edited
7 copied

Legend:

Unmodified
Added
Removed
  • trunk/base

  • trunk/base/doc/Makefile.in

    r124015 r124047  
    3636                port-distfiles.1 \
    3737                port-dmg.1 \
     38        port-doctor.1 \
    3839                port-echo.1 \
    3940                port-edit.1 \
     
    5859                port-rdependents.1 \
    5960                port-rdeps.1 \
     61        port-reclaim.1 \
    6062                port-rev-upgrade.1 \
    6163                port-selfupdate.1 \
  • trunk/base/src/macports1.0/Makefile.in

    r122044 r124047  
    55
    66SRCS=           macports.tcl macports_dlist.tcl macports_util.tcl \
    7                 macports_autoconf.tcl
     7                macports_autoconf.tcl doctor.tcl reclaim.tcl
    88OBJS=           macports.o get_systemconfiguration_proxies.o sysctl.o
    99SHLIB_NAME=     MacPorts${SHLIB_SUFFIX}
  • trunk/base/src/macports1.0/macports.tcl

    r123881 r124047  
    3737package require macports_dlist 1.0
    3838package require macports_util 1.0
     39package require doctor 1.0
     40package require reclaim 1.0
    3941package require Tclx
    4042
     
    5658    variable portinterp_options "\
    5759        portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
    58         registry.path registry.format user_home \
     60        registry.path registry.format user_home user_path \
    5961        portarchivetype archivefetch_pubkeys portautoclean porttrace keeplogs portverbose destroot_umask \
    6062        rsync_server rsync_options rsync_dir startupitem_type startupitem_install place_worksymlink macportsuser \
     
    659661    }
    660662
     663    # Save the path for future processing
     664    set macports::user_path $env(PATH)
     665
    661666    # Configure the search path for configuration files
    662667    set conf_files {}
     
    11891194        }
    11901195    }
     1196
     1197    # Check the last time 'reclaim' was run
     1198    macports::check_last_reclaim
    11911199
    11921200    # init registry
     
    43864394}
    43874395
     4396proc macports::doctor_main {opts} {
     4397   
     4398    # Calls the main function for the 'port doctor' command.
     4399    #
     4400    # Args:
     4401    #           None
     4402    # Returns:
     4403    #           0 on successful execution.
     4404
     4405    doctor::main $opts
     4406    return 0
     4407}
     4408
     4409proc macports::check_last_reclaim {} {
     4410
     4411    # An abstraction layer for the reclaim function, 'check_last_run'.
     4412    #
     4413    # Args:
     4414    #           None
     4415    # Returns:
     4416    #           None
     4417
     4418    reclaim::check_last_run
     4419    return 0
     4420}
     4421
     4422proc macports::reclaim_main {} {
     4423
     4424    # Calls the main function for the 'port reclaim' command.
     4425    #
     4426    # Args:
     4427    #           None
     4428    # Returns:
     4429    #           None
     4430
     4431    reclaim::main
     4432    return 0
     4433}
     4434
    43884435##
    43894436# Execute the rev-upgrade scan and attempt to rebuild all ports found to be
  • trunk/base/src/port/port.tcl

    r123857 r124047  
    4444}
    4545
     46package require Tclx
    4647package require macports
    4748package require Pextlib 1.0
     
    27262727}
    27272728
     2729proc action_doctor { action portlist opts } {
     2730    if {[prefix_unwritable]} {
     2731        return 1
     2732    }
     2733    macports::doctor_main $opts
     2734    return 0
     2735}
     2736
     2737proc action_reclaim { action portlist opts } {
     2738    if {[prefix_unwritable]} {
     2739        return 1
     2740    }
     2741    macports::reclaim_main 
     2742    return 0
     2743}
     2744
    27282745
    27292746proc action_upgrade { action portlist opts } {
     
    42064223    upgrade     [list action_upgrade        [ACTION_ARGS_PORTS]] \
    42074224    rev-upgrade [list action_revupgrade     [ACTION_ARGS_NONE]] \
     4225    reclaim     [list action_reclaim        [ACTION_ARGS_NONE]] \
     4226    doctor      [list action_doctor         [ACTION_ARGS_NONE]] \
    42084227    \
    42094228    version     [list action_version        [ACTION_ARGS_NONE]] \
     
    43654384    upgrade     {force enforce-variants no-replace no-rev-upgrade}
    43664385    rev-upgrade {id-loadcmd-check}
     4386    doctor      {quiet}
    43674387}
    43684388
Note: See TracChangeset for help on using the changeset viewer.