[122853] branches/gsoc14-cleanup/src
ksammons at macports.org
ksammons at macports.org
Thu Jul 31 14:07:55 PDT 2014
Revision: 122853
https://trac.macports.org/changeset/122853
Author: ksammons at macports.org
Date: 2014-07-31 14:07:55 -0700 (Thu, 31 Jul 2014)
Log Message:
-----------
Fixed merge issues
Modified Paths:
--------------
branches/gsoc14-cleanup/src/macports1.0/doctor.tcl
branches/gsoc14-cleanup/src/macports1.0/macports.tcl
branches/gsoc14-cleanup/src/port/port
branches/gsoc14-cleanup/src/port/port.tcl
Modified: branches/gsoc14-cleanup/src/macports1.0/doctor.tcl
===================================================================
--- branches/gsoc14-cleanup/src/macports1.0/doctor.tcl 2014-07-31 21:02:25 UTC (rev 122852)
+++ branches/gsoc14-cleanup/src/macports1.0/doctor.tcl 2014-07-31 21:07:55 UTC (rev 122853)
@@ -1,18 +1,5 @@
# Todo:
-<<<<<<< HEAD
-# Move port_doctor.ini to the port tree, below _resources
-# Command-Line tools version check
-# Support comments for the parser
-# Add error catching for line's without an equals sign.
-
-package provide doctor 1.0
-package require macports
-
-namespace eval doctor {
-
- proc main {} {
-=======
# Check the $DISPLAY
# Done:
@@ -55,17 +42,10 @@
proc main {opts} {
->>>>>>> svn
# The main function. Handles all the calls to the correct functions, and sets the config_options array,
# as well as the parser_options array.
#
# Args:
-<<<<<<< HEAD
- # None
- # Returns:
- # None
-
-=======
# opts - The options passed in. Currently the only option availible is 'quiet'.
# Returns:
# None
@@ -77,18 +57,13 @@
set doctor::quiet 0
}
->>>>>>> svn
array set config_options [list]
set parser_options {"macports_location" "profile_path" "shell_location" "xcode_version_10.9" "xcode_version_10.8" \
"xcode_version_10.7" "xcode_version_10.6" "xcode_version_10.7" "xcode_version_10.6" "xcode_version_10.5" \
"xcode_version_10.4" "xcode_build"}
set user_config_path ${macports::portdbpath}/port_doctor.ini
-<<<<<<< HEAD
- set xcode_config_path ${macports::portdbpath}/xcode_versions.ini
-=======
set xcode_config_path ${macports::portdbpath}/sources/rsync.macports.org/release/tarballs/ports/_resources/xcode_versions.ini
->>>>>>> svn
# Make sure at least a default copy of the xcode and user config exist
make_xcode_config
@@ -101,8 +76,6 @@
# Start the checks
check_path $config_options(macports_location) $config_options(profile_path) $config_options(shell_location)
check_xcode config_options
-<<<<<<< HEAD
-=======
check_for_app curl
check_for_app rsync
check_for_app openssl
@@ -526,7 +499,6 @@
}
success_fail 1
->>>>>>> svn
}
proc check_xcode {config_options} {
@@ -538,11 +510,8 @@
# Returns:
# None
-<<<<<<< HEAD
-=======
output "correct Xcode version"
->>>>>>> svn
upvar $config_options config
set mac_version ${macports::macosx_version}
@@ -550,20 +519,14 @@
set xcode_versions $config(xcode_version_$mac_version)
if {$xcode_current in $xcode_versions} {
-<<<<<<< HEAD
-=======
success_fail 1
->>>>>>> svn
return
} else {
ui_error "currently installed version of Xcode, $xcode_current, is not supported by MacPorts. \
For your currently installed system, only the following versions of Xcode are supported: \
$xcode_versions"
-<<<<<<< HEAD
-=======
success_fail 0
->>>>>>> svn
}
}
@@ -576,13 +539,8 @@
# Returns:
# None
-<<<<<<< HEAD
- set path ${macports::portdbpath}/xcode_versions.ini
-=======
#FIXME: This most likely shouldn't be hardcoded... but for now it is. Fix it.
-
set path ${macports::portdbpath}/sources/rsync.macports.org/release/tarballs/ports/_resources/xcode_versions.ini
->>>>>>> svn
if {[file exists $path] == 0} {
ui_warn "No configuration file found at $path. Creating generic config file."
@@ -617,11 +575,7 @@
ui_warn "No configuration file found at $path. Creating generic config file."
set fd [open $path w]
-<<<<<<< HEAD
- puts $fd "macports_location=/opt/local"
-=======
puts $fd "macports_location=${macports::prefix}"
->>>>>>> svn
puts $fd "profile_path=${macports::user_home}/.bash_profile"
puts $fd "shell_location=/bin/bash"
@@ -631,13 +585,8 @@
proc get_config {config_options parser_options path} {
-<<<<<<< HEAD
- # Reads in and parses the configureation file, port_doctor.ini. After parsing, all variables found are assigned
- # in the 'config_options' associative array.
-=======
# Reads in and parses the configuration file passed in to $path. After parsing, all variables found are assigned
# in the 'config_options' associative array.
->>>>>>> svn
#
# Args:
# config_options - The associative array responsible for holding all the configuration options.
@@ -655,14 +604,7 @@
close $fd
foreach line $data {
-<<<<<<< HEAD
- set tokens [split $line "="]
- if {[lindex $tokens 0] in $parser_options} {
- set config([lindex $tokens 0]) [lindex $tokens 1]
-
-=======
-
# Ignore comments
if {[string index $line 0] eq "#" } {
continue
@@ -676,7 +618,6 @@
set config([lindex $tokens 0]) [lindex $tokens 1]
# Ignore whitespace
->>>>>>> svn
} elseif {[lindex $tokens 0] eq ""} {
continue
@@ -702,14 +643,10 @@
set split [split $path :]
if {"$port_loc/bin" in $split && "$port_loc/sbin" in $split } {
-<<<<<<< HEAD
-=======
-
if {[lindex $split 0] != "$port_loc/bin"} {
ui_warn "$port_loc/bin is not first in your PATH environmental variable. This may or may not \
cause problems in the future."
}
->>>>>>> svn
return
} else {
@@ -730,16 +667,8 @@
puts $fd "export PATH=$port_loc/bin:$port_loc/sbin:\$PATH"
close $fd
-<<<<<<< HEAD
- ui_msg "Reloading $profile_path..."
- exec $shell_loc $profile_path
-
- ui_msg "Port should now be successfully set up."
-
-=======
ui_msg "Added PATH properly. Please execute, 'source $profile_path' in a new terminal window."
->>>>>>> svn
} elseif {$input == "n" || $input == "N"} {
ui_msg "Not fixing your \$PATH variable."
Modified: branches/gsoc14-cleanup/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc14-cleanup/src/macports1.0/macports.tcl 2014-07-31 21:02:25 UTC (rev 122852)
+++ branches/gsoc14-cleanup/src/macports1.0/macports.tcl 2014-07-31 21:07:55 UTC (rev 122853)
@@ -4371,11 +4371,7 @@
return yes
}
-<<<<<<< HEAD
-proc macports::doctor_main {} {
-=======
proc macports::doctor_main {opts} {
->>>>>>> svn
# Calls the main function for the 'port doctor' command.
#
@@ -4384,11 +4380,7 @@
# Returns:
# 0 on successful execution.
-<<<<<<< HEAD
- doctor::main
-=======
doctor::main $opts
->>>>>>> svn
return 0
}
Modified: branches/gsoc14-cleanup/src/port/port
===================================================================
--- branches/gsoc14-cleanup/src/port/port 2014-07-31 21:02:25 UTC (rev 122852)
+++ branches/gsoc14-cleanup/src/port/port 2014-07-31 21:07:55 UTC (rev 122853)
@@ -2732,24 +2732,17 @@
}
proc action_doctor { action portlist opts } {
-<<<<<<< HEAD
- macports::doctor_main
-=======
if {[prefix_unwritable]} {
return 1
}
macports::doctor_main $opts
->>>>>>> svn
return 0
}
proc action_reclaim { action portlist opts } {
-<<<<<<< HEAD
-=======
if {[prefix_unwritable]} {
return 1
}
->>>>>>> svn
macports::reclaim_main
return 0
}
Modified: branches/gsoc14-cleanup/src/port/port.tcl
===================================================================
--- branches/gsoc14-cleanup/src/port/port.tcl 2014-07-31 21:02:25 UTC (rev 122852)
+++ branches/gsoc14-cleanup/src/port/port.tcl 2014-07-31 21:07:55 UTC (rev 122853)
@@ -2731,24 +2731,17 @@
}
proc action_doctor { action portlist opts } {
-<<<<<<< HEAD
- macports::doctor_main
-=======
if {[prefix_unwritable]} {
return 1
}
macports::doctor_main $opts
->>>>>>> svn
return 0
}
proc action_reclaim { action portlist opts } {
-<<<<<<< HEAD
-=======
if {[prefix_unwritable]} {
return 1
}
->>>>>>> svn
macports::reclaim_main
return 0
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140731/dd0b80b8/attachment.html>
More information about the macports-changes
mailing list