<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/1f839d31f6db57ad11dd8b2943c4b1d10f8fc5b8">https://github.com/macports/macports-base/commit/1f839d31f6db57ad11dd8b2943c4b1d10f8fc5b8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1f839d31f6db57ad11dd8b2943c4b1d10f8fc5b8
</span>Author: Umesh Singla <umeshksingla@macports.org>
AuthorDate: Sat Sep 2 15:07:43 2017 +0530
<span style='display:block; white-space:pre;color:#404040;'> Correct the flow for yes-no question followup
</span>---
src/macports1.0/macports.tcl | 3 +--
src/macports1.0/migrate.tcl | 30 +++++++++++++++++++-----------
2 files changed, 20 insertions(+), 13 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 e0e8073..81f3422 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;'>@@ -4445,8 +4445,7 @@ proc macports::migrate_main {opts} {
</span> # Returns:
# 0 on successful execution.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- migrate::main $opts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [migrate::main $opts]
</span> }
##
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/migrate.tcl b/src/macports1.0/migrate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 198593b..e99bb60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/migrate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/migrate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,43 +37,47 @@ package require restore 1.0
</span>
namespace eval migrate {
proc main {opts} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The main function. Calls each individual function that needs to be run.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The main function. Calls each individual step in order.
</span> #
# Args:
# opts - options array.
# Returns:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 0 if success
</span>
array set options $opts
# create a snapshot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg ":: Taking a snapshot of the current state.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Taking a snapshot of the current state.."
</span> set snapshot [snapshot::main $opts]
set id [$snapshot id]
set note [$snapshot note]
set datetime [$snapshot created_at]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg ":: Done: snapshot '$id':'$note' created at $datetime"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Done: snapshot '$id':'$note' created at $datetime"
</span>
if {[info exists macports::ui_options(questions_yesno)]} {
set msg "Migration will first uninstall all the installed ports and then reinstall."
set retvalue [$macports::ui_options(questions_yesno) $msg "MigrationPrompt" "" {y} 0 "Would you like to continue?"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$retvalue == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg ":: Uninstalling all ports.."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall_installed [registry::entry imaged]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$retvalue == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # quit as user answered 'no'
</span> ui_msg "Not uninstalling ports."
return 0
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg ":: Fetching ports to install.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Uninstalling all ports.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall_installed [registry::entry imaged]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Upgrading macports.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ upgrade_port_command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Fetching ports to install.."
</span> set snapshot_portlist [$snapshot ports]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg ":: Restoring the original state.."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Restoring the original state.."
</span> restore::restore_state $snapshot_portlist
# TODO: CLEAN PARTIAL BUILDS STEP HERE
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0
</span> }
proc uninstall_installed {portlist} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,4 +91,8 @@ namespace eval migrate {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc upgrade_port_command {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>