Ignore:
Timestamp:
Apr 25, 2013, 7:28:36 PM (7 years ago)
Author:
snc@…
Message:

gsoc11-statistics: rebase from trunk

Location:
branches/gsoc11-statistics/base
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/gsoc11-statistics/base

  • branches/gsoc11-statistics/base/src/macports1.0/macports.tcl

    r105085 r105577  
    5252        revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \
    5353        host_blacklist preferred_hosts\
    54         packagemaker_path default_compilers"
     54        packagemaker_path default_compilers pkg_post_unarchive_deletions"
    5555    variable user_options ""
    5656    variable portinterp_options "\
     
    6262        applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \
    6363        os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \
    64         packagemaker_path default_compilers $user_options"
     64        packagemaker_path default_compilers \
     65        pkg_post_unarchive_deletions $user_options"
    6566
    6667    # deferred options are only computed when needed.
  • branches/gsoc11-statistics/base/src/package1.0/portpkg.tcl

    r105085 r105577  
    112112    global UI_PREFIX portdbpath destpath workpath prefix description \
    113113    package.flat package.destpath portpath os.version os.major \
    114     package.resources package.scripts portpkg::packagemaker portpkg::language
     114    package.resources package.scripts portpkg::packagemaker \
     115    pkg_post_unarchive_deletions portpkg::language
    115116
    116117    set portepoch_namestr ""
     
    135136            eval file rename [glob ${destpath}/${dir}/*] "${destpath}/private/${dir}"
    136137            delete "${destpath}/${dir}"
     138        }
     139    }
     140
     141    if {[info exists pkg_post_unarchive_deletions]} {
     142        foreach rmfile ${pkg_post_unarchive_deletions} {
     143            set full_rmfile "${destpath}${prefix}/${rmfile}"
     144            if {[file exists "${full_rmfile}"]} {
     145                delete "${full_rmfile}"
     146            }
    137147        }
    138148    }
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha2.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha2.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha256cmd.c

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/pextlib1.0/sha256cmd.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/gsoc11-statistics/base/src/port/port.tcl

    r105085 r105577  
    420420
    421421# Supply a default porturl/portname if the portlist is empty
    422 proc require_portlist { nameportlist } {
     422proc require_portlist { nameportlist {is_upgrade "no"} } {
    423423    global private_options
    424424    upvar $nameportlist portlist
    425425
    426426    if {[llength $portlist] == 0 && (![info exists private_options(ports_no_args)] || $private_options(ports_no_args) == "no")} {
     427        if {${is_upgrade} == "yes"} {
     428            # $> port upgrade outdated
     429            # Error: No ports matched the given expression
     430            # is not very user friendly - if we're in the special case of
     431            # "upgrade", let's print a message that's a little easier to
     432            # understand and less alarming.
     433            ui_msg "Nothing to upgrade."
     434            return 1
     435        }
    427436        ui_error "No ports matched the given expression"
    428437        return 1
     
    25952604        global errorInfo
    25962605        ui_debug "$errorInfo"
     2606        ui_error "$result"
     2607        if {![macports::ui_isset ports_verbose]} {
     2608            ui_msg "Please run `port -v selfupdate' for details."
     2609        } else {
     2610            # Let's only print the ticket URL if the user has followed the
     2611            # advice we printed earlier.
     2612            print_tickets_url
     2613        }
    25972614        fatal "port selfupdate failed: $result"
    25982615    }
     
    26342651
    26352652proc action_upgrade { action portlist opts } {
    2636     if {[require_portlist portlist] || ([prefix_unwritable] && ![macports::global_option_isset ports_dryrun])} {
     2653    if {[require_portlist portlist "yes"] || ([prefix_unwritable] && ![macports::global_option_isset ports_dryrun])} {
    26372654        return 1
    26382655    }
  • branches/gsoc11-statistics/base/src/port1.0/portconfigure.tcl

    r105085 r105577  
    751751        # Execute the command (with the new environment).
    752752        if {[catch {command_exec configure} result]} {
     753            global configure.dir
     754            if {[file exists ${configure.dir}/config.log]} {
     755                ui_error "[format [msgcat::mc "Failed to configure %s, consult %s/config.log"] [option subport] ${configure.dir}]"
     756            }
    753757            return -code error "[format [msgcat::mc "%s failure: %s"] configure $result]"
    754758        }
  • branches/gsoc11-statistics/base/src/registry2.0/receipt_sqlite.tcl

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.