<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[122853] branches/gsoc14-cleanup/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/122853">122853</a></dd>
<dt>Author</dt> <dd>ksammons@macports.org</dd>
<dt>Date</dt> <dd>2014-07-31 14:07:55 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed merge issues</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14cleanupsrcmacports10doctortcl">branches/gsoc14-cleanup/src/macports1.0/doctor.tcl</a></li>
<li><a href="#branchesgsoc14cleanupsrcmacports10macportstcl">branches/gsoc14-cleanup/src/macports1.0/macports.tcl</a></li>
<li><a href="#branchesgsoc14cleanupsrcportport">branches/gsoc14-cleanup/src/port/port</a></li>
<li><a href="#branchesgsoc14cleanupsrcportporttcl">branches/gsoc14-cleanup/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14cleanupsrcmacports10doctortcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-cleanup/src/macports1.0/doctor.tcl (122852 => 122853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,18 +1,5 @@
</span><span class="cx">
</span><span class="cx"> # Todo:
</span><del>-<<<<<<< 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 {} {
-=======
</del><span class="cx"> # Check the $DISPLAY
</span><span class="cx">
</span><span class="cx"> # Done:
</span><span class="lines">@@ -55,17 +42,10 @@
</span><span class="cx">
</span><span class="cx"> proc main {opts} {
</span><span class="cx">
</span><del>->>>>>>> svn
</del><span class="cx"> # The main function. Handles all the calls to the correct functions, and sets the config_options array,
</span><span class="cx"> # as well as the parser_options array.
</span><span class="cx"> #
</span><span class="cx"> # Args:
</span><del>-<<<<<<< HEAD
- # None
- # Returns:
- # None
-
-=======
</del><span class="cx"> # opts - The options passed in. Currently the only option availible is 'quiet'.
</span><span class="cx"> # Returns:
</span><span class="cx"> # None
</span><span class="lines">@@ -77,18 +57,13 @@
</span><span class="cx"> set doctor::quiet 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>->>>>>>> svn
</del><span class="cx"> array set config_options [list]
</span><span class="cx"> set parser_options {"macports_location" "profile_path" "shell_location" "xcode_version_10.9" "xcode_version_10.8" \
</span><span class="cx"> "xcode_version_10.7" "xcode_version_10.6" "xcode_version_10.7" "xcode_version_10.6" "xcode_version_10.5" \
</span><span class="cx"> "xcode_version_10.4" "xcode_build"}
</span><span class="cx">
</span><span class="cx"> set user_config_path ${macports::portdbpath}/port_doctor.ini
</span><del>-<<<<<<< HEAD
- set xcode_config_path ${macports::portdbpath}/xcode_versions.ini
-=======
</del><span class="cx"> set xcode_config_path ${macports::portdbpath}/sources/rsync.macports.org/release/tarballs/ports/_resources/xcode_versions.ini
</span><del>->>>>>>> svn
</del><span class="cx">
</span><span class="cx"> # Make sure at least a default copy of the xcode and user config exist
</span><span class="cx"> make_xcode_config
</span><span class="lines">@@ -101,8 +76,6 @@
</span><span class="cx"> # Start the checks
</span><span class="cx"> check_path $config_options(macports_location) $config_options(profile_path) $config_options(shell_location)
</span><span class="cx"> check_xcode config_options
</span><del>-<<<<<<< HEAD
-=======
</del><span class="cx"> check_for_app curl
</span><span class="cx"> check_for_app rsync
</span><span class="cx"> check_for_app openssl
</span><span class="lines">@@ -526,7 +499,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> success_fail 1
</span><del>->>>>>>> svn
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc check_xcode {config_options} {
</span><span class="lines">@@ -538,11 +510,8 @@
</span><span class="cx"> # Returns:
</span><span class="cx"> # None
</span><span class="cx">
</span><del>-<<<<<<< HEAD
-=======
</del><span class="cx"> output "correct Xcode version"
</span><span class="cx">
</span><del>->>>>>>> svn
</del><span class="cx"> upvar $config_options config
</span><span class="cx">
</span><span class="cx"> set mac_version ${macports::macosx_version}
</span><span class="lines">@@ -550,20 +519,14 @@
</span><span class="cx"> set xcode_versions $config(xcode_version_$mac_version)
</span><span class="cx">
</span><span class="cx"> if {$xcode_current in $xcode_versions} {
</span><del>-<<<<<<< HEAD
-=======
</del><span class="cx"> success_fail 1
</span><del>->>>>>>> svn
</del><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> ui_error "currently installed version of Xcode, $xcode_current, is not supported by MacPorts. \
</span><span class="cx"> For your currently installed system, only the following versions of Xcode are supported: \
</span><span class="cx"> $xcode_versions"
</span><del>-<<<<<<< HEAD
-=======
</del><span class="cx"> success_fail 0
</span><del>->>>>>>> svn
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -576,13 +539,8 @@
</span><span class="cx"> # Returns:
</span><span class="cx"> # None
</span><span class="cx">
</span><del>-<<<<<<< HEAD
- set path ${macports::portdbpath}/xcode_versions.ini
-=======
</del><span class="cx"> #FIXME: This most likely shouldn't be hardcoded... but for now it is. Fix it.
</span><del>-
</del><span class="cx"> set path ${macports::portdbpath}/sources/rsync.macports.org/release/tarballs/ports/_resources/xcode_versions.ini
</span><del>->>>>>>> svn
</del><span class="cx">
</span><span class="cx"> if {[file exists $path] == 0} {
</span><span class="cx"> ui_warn "No configuration file found at $path. Creating generic config file."
</span><span class="lines">@@ -617,11 +575,7 @@
</span><span class="cx"> ui_warn "No configuration file found at $path. Creating generic config file."
</span><span class="cx">
</span><span class="cx"> set fd [open $path w]
</span><del>-<<<<<<< HEAD
- puts $fd "macports_location=/opt/local"
-=======
</del><span class="cx"> puts $fd "macports_location=${macports::prefix}"
</span><del>->>>>>>> svn
</del><span class="cx"> puts $fd "profile_path=${macports::user_home}/.bash_profile"
</span><span class="cx"> puts $fd "shell_location=/bin/bash"
</span><span class="cx">
</span><span class="lines">@@ -631,13 +585,8 @@
</span><span class="cx">
</span><span class="cx"> proc get_config {config_options parser_options path} {
</span><span class="cx">
</span><del>-<<<<<<< HEAD
- # Reads in and parses the configureation file, port_doctor.ini. After parsing, all variables found are assigned
- # in the 'config_options' associative array.
-=======
</del><span class="cx"> # Reads in and parses the configuration file passed in to $path. After parsing, all variables found are assigned
</span><span class="cx"> # in the 'config_options' associative array.
</span><del>->>>>>>> svn
</del><span class="cx"> #
</span><span class="cx"> # Args:
</span><span class="cx"> # config_options - The associative array responsible for holding all the configuration options.
</span><span class="lines">@@ -655,14 +604,7 @@
</span><span class="cx"> close $fd
</span><span class="cx">
</span><span class="cx"> foreach line $data {
</span><del>-<<<<<<< HEAD
- set tokens [split $line "="]
</del><span class="cx">
</span><del>- if {[lindex $tokens 0] in $parser_options} {
- set config([lindex $tokens 0]) [lindex $tokens 1]
-
-=======
-
</del><span class="cx"> # Ignore comments
</span><span class="cx"> if {[string index $line 0] eq "#" } {
</span><span class="cx"> continue
</span><span class="lines">@@ -676,7 +618,6 @@
</span><span class="cx"> set config([lindex $tokens 0]) [lindex $tokens 1]
</span><span class="cx">
</span><span class="cx"> # Ignore whitespace
</span><del>->>>>>>> svn
</del><span class="cx"> } elseif {[lindex $tokens 0] eq ""} {
</span><span class="cx"> continue
</span><span class="cx">
</span><span class="lines">@@ -702,14 +643,10 @@
</span><span class="cx"> set split [split $path :]
</span><span class="cx">
</span><span class="cx"> if {"$port_loc/bin" in $split && "$port_loc/sbin" in $split } {
</span><del>-<<<<<<< HEAD
-=======
-
</del><span class="cx"> if {[lindex $split 0] != "$port_loc/bin"} {
</span><span class="cx"> ui_warn "$port_loc/bin is not first in your PATH environmental variable. This may or may not \
</span><span class="cx"> cause problems in the future."
</span><span class="cx"> }
</span><del>->>>>>>> svn
</del><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="lines">@@ -730,16 +667,8 @@
</span><span class="cx"> puts $fd "export PATH=$port_loc/bin:$port_loc/sbin:\$PATH"
</span><span class="cx"> close $fd
</span><span class="cx">
</span><del>-<<<<<<< HEAD
- ui_msg "Reloading $profile_path..."
- exec $shell_loc $profile_path
-
- ui_msg "Port should now be successfully set up."
-
-=======
</del><span class="cx"> ui_msg "Added PATH properly. Please execute, 'source $profile_path' in a new terminal window."
</span><span class="cx">
</span><del>->>>>>>> svn
</del><span class="cx"> } elseif {$input == "n" || $input == "N"} {
</span><span class="cx"> ui_msg "Not fixing your \$PATH variable."
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc14cleanupsrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-cleanup/src/macports1.0/macports.tcl (122852 => 122853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4371,11 +4371,7 @@
</span><span class="cx"> return yes
</span><span class="cx"> }
</span><span class="cx">
</span><del>-<<<<<<< HEAD
-proc macports::doctor_main {} {
-=======
</del><span class="cx"> proc macports::doctor_main {opts} {
</span><del>->>>>>>> svn
</del><span class="cx">
</span><span class="cx"> # Calls the main function for the 'port doctor' command.
</span><span class="cx"> #
</span><span class="lines">@@ -4384,11 +4380,7 @@
</span><span class="cx"> # Returns:
</span><span class="cx"> # 0 on successful execution.
</span><span class="cx">
</span><del>-<<<<<<< HEAD
- doctor::main
-=======
</del><span class="cx"> doctor::main $opts
</span><del>->>>>>>> svn
</del><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc14cleanupsrcportport"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-cleanup/src/port/port (122852 => 122853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2732,24 +2732,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc action_doctor { action portlist opts } {
</span><del>-<<<<<<< HEAD
- macports::doctor_main
-=======
</del><span class="cx"> if {[prefix_unwritable]} {
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> macports::doctor_main $opts
</span><del>->>>>>>> svn
</del><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc action_reclaim { action portlist opts } {
</span><del>-<<<<<<< HEAD
-=======
</del><span class="cx"> if {[prefix_unwritable]} {
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><del>->>>>>>> svn
</del><span class="cx"> macports::reclaim_main
</span><span class="cx"> return 0
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesgsoc14cleanupsrcportporttcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-cleanup/src/port/port.tcl (122852 => 122853)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2731,24 +2731,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc action_doctor { action portlist opts } {
</span><del>-<<<<<<< HEAD
- macports::doctor_main
-=======
</del><span class="cx"> if {[prefix_unwritable]} {
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> macports::doctor_main $opts
</span><del>->>>>>>> svn
</del><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc action_reclaim { action portlist opts } {
</span><del>-<<<<<<< HEAD
-=======
</del><span class="cx"> if {[prefix_unwritable]} {
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><del>->>>>>>> svn
</del><span class="cx"> macports::reclaim_main
</span><span class="cx"> return 0
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>