<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch gsoc17-migrate
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/e4c50fcdef7806e9cc34515cb3030b5e04592f28">https://github.com/macports/macports-base/commit/e4c50fcdef7806e9cc34515cb3030b5e04592f28</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e4c50fcdef7806e9cc34515cb3030b5e04592f28
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Jan 7 15:35:36 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> macports: Use needs_migration, chng migration msg
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Re-use migration::needs_migration instead of re-implementing the check
</span><span style='display:block; white-space:pre;color:#404040;'> in macports.tcl. Additionally, change the migration message to recommend
</span><span style='display:block; white-space:pre;color:#404040;'> running 'sudo port migrate'.
</span>---
src/macports1.0/macports.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 112ac17..acb5fd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -690,9 +690,9 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
</span> macosx_version
# Check that the current platform is the one we were configured for, otherwise need to do migration
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {($os_platform ne $macports::autoconf::os_platform) || ($os_major != $macports::autoconf::os_major)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[migrate::needs_migration]} {
</span> ui_error "Current platform \"$os_platform $os_major\" does not match expected platform \"$macports::autoconf::os_platform $macports::autoconf::os_major\""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "If you upgraded your OS, please follow the migration instructions: https://trac.macports.org/wiki/Migration"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Please run 'sudo port migrate' or follow the migration instructions: https://trac.macports.org/wiki/Migration"
</span> return -code error "OS platform mismatch"
}
</pre><pre style='margin:0'>
</pre>