Changeset 118305 for trunk/base
- Timestamp:
- Mar 29, 2014, 7:31:50 PM (10 years ago)
- Location:
- trunk/base/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/base/src/macports1.0/macports.tcl
r118304 r118305 1973 1973 # An error occurred. 1974 1974 global ::logenabled ::debuglogname 1975 ui_error "Failed to install $portname"1976 1975 ui_debug $::errorInfo 1977 1976 if {[info exists ::logenabled] && $::logenabled && [info exists ::debuglogname]} { 1978 ui_ notice "Please see the log file for port $portname for details:\n $::debuglogname"1977 ui_error "See $::debuglogname for details." 1979 1978 } 1980 1979 macports::pop_log … … 2060 2059 2061 2060 if {$result ne {}} { 2062 set errstring "The following dependencies were not installed:" 2063 foreach ditem $result { 2064 append errstring " [ditem_key $ditem provides]" 2065 } 2066 ui_error $errstring 2061 ## 2062 # When this happens, the failing port usually already printed an 2063 # error message. Omit this one to avoid cluttering the output and 2064 # hiding the *real* problem. 2065 2066 #set errstring "The following dependencies were not installed:" 2067 #foreach ditem $result { 2068 # append errstring " [ditem_key $ditem provides]" 2069 #} 2070 #ui_error $errstring 2067 2071 foreach ditem $dlist { 2068 2072 catch {mportclose $ditem} … … 2102 2106 if {[info exists ::logenabled] && $::logenabled && [info exists ::debuglogname]} { 2103 2107 if {$result != 0} { 2104 ui_ notice "Please see the log file for port $portname for details:\n $::debuglogname"2108 ui_error "See $::debuglogname for details." 2105 2109 } 2106 2110 macports::pop_log -
trunk/base/src/port/port.tcl
r118304 r118305 246 246 proc print_tickets_url {args} { 247 247 if {${macports::prefix} ne "/usr/local" && ${macports::prefix} ne "/usr"} { 248 ui_ notice "To report a bug, follow the instructions in the guide:\n http://guide.macports.org/#project.tickets"248 ui_error "Follow http://guide.macports.org/#project.tickets to report a bug." 249 249 } 250 250 } … … 4104 4104 } 4105 4105 } 4106 4106 4107 4107 return $status 4108 4108 } -
trunk/base/src/port1.0/portutil.tcl
r117407 r118305 1581 1581 # - this step must be written to file 1582 1582 if {$skipped == 0 1583 && [ditem_key $ditem runtype] ne "always"1584 && [ditem_key $ditem state] ne "no"} {1585 write_statefile target $targetname $target_state_fd1583 && [ditem_key $ditem runtype] ne "always" 1584 && [ditem_key $ditem state] ne "no"} { 1585 write_statefile target $targetname $target_state_fd 1586 1586 } 1587 1587 } else { 1588 ui_error "$targetname for port $portname returned: $errstr" 1588 if {$errstr ne {}} { 1589 ui_error "Failed to $target $portname: $errstr" 1590 } else { 1591 ui_error "Failed to $target $portname." 1592 } 1589 1593 ui_debug "Error code: $errcode" 1590 1594 ui_debug "Backtrace: $errinfo" … … 2133 2137 array set oldvariations {} 2134 2138 if {[check_statefile_variants variations oldvariations $state_fd]} { 2135 ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match original selection \"[canonicalize_variants [array get oldvariations]]\".\nPlease use the same variants again, perform 'port clean [option subport]' or specify the force option (-f)." 2139 ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match original selection \"[canonicalize_variants [array get oldvariations]]\"." 2140 ui_error "Please use the same variants again, perform 'port clean [option subport]' or specify the force option (-f)." 2136 2141 set result 1 2137 2142 } elseif {!([info exists ports_dryrun] && $ports_dryrun eq "yes")} {
Note: See TracChangeset
for help on using the changeset viewer.