<pre style='margin:0'>
Umesh Singla (umeshksingla) pushed a commit to branch gsoc17-migrate
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/3fc1f832389845687a320370bbda2ae0a93182af">https://github.com/macports/macports-base/commit/3fc1f832389845687a320370bbda2ae0a93182af</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3fc1f832389845687a320370bbda2ae0a93182af
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sun Jan 7 15:25:28 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> restore: Remove port command checking
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Users cannot run 'port restore' with a base installation that requires
</span><span style='display:block; white-space:pre;color:#404040;'> migration at the moment, because the check in 'mportinit' will already
</span><span style='display:block; white-space:pre;color:#404040;'> abort before 'restore::main' is even run.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove the check for now; we will re-use the check in mportinit and add
</span><span style='display:block; white-space:pre;color:#404040;'> an exception for 'port migrate' instead.
</span>---
src/macports1.0/restore.tcl | 20 --------------------
1 file changed, 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/restore.tcl b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 89a2bd9..9f8566a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,10 +69,6 @@ namespace eval restore {
</span> deactivate_all
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![check_port_command]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "OS platform mismatch"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ui_msg "Restoring snapshot '[$snapshot note]' created at [$snapshot created_at]"
ui_msg "Fetching ports to install..."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,22 +80,6 @@ namespace eval restore {
</span> return 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- proc check_port_command {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global tcl_platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_version $tcl_platform(osVersion)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_major [lindex [split $os_version .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_platform [string tolower $tcl_platform(os)]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check that the current platform is the one we were configured for, otherwise need to do migration
</span><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:#ffe0e0;'>- ui_error "Current platform \"$os_platform $os_major\" does not match expected platform \"$macports::autoconf::os_platform $macports::autoconf::os_major\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "If you upgraded your OS or changed the hardware architecture, you need to run 'port migrate' instead."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc fetch_snapshot {snapshot_id} {
return [registry::snapshot get_by_id $snapshot_id]
}
</pre><pre style='margin:0'>
</pre>