<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/8dfcf15e940f6b250bd4aa3fcdaeb478f3a76a37">https://github.com/macports/macports-base/commit/8dfcf15e940f6b250bd4aa3fcdaeb478f3a76a37</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8dfcf15e940f6b250bd4aa3fcdaeb478f3a76a37
</span>Author: umeshksingla <umeshksingla@macports.org>
AuthorDate: Tue Oct 15 16:53:09 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> remove unnecessary code
</span>---
src/macports1.0/restore.tcl | 23 ++++-------------------
src/port/port.tcl | 1 -
2 files changed, 4 insertions(+), 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 ba30f02..8127d90 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;'>@@ -62,13 +62,14 @@ namespace eval restore {
</span> if {[info exists options(ports_restore_snapshot-id)]} {
# use the specified snapshot
puts "snapshotid : $options(ports_restore_snapshot-id)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set snapshot [fetch_snapshot $options(ports_restore_snapshot-id)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set snapshot_id $options(ports_restore_snapshot-id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set snapshot [registry::snapshot get_by_id $snapshot_id]
</span> ui_msg "Deactivating all ports installed.."
deactivate_all
} elseif {[info exists options(ports_restore_last)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set snapshot [fetch_snapshot_last]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set snapshot [registry::snapshot get_last]
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set snapshots [list_snapshots]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set snapshots [registry::snapshot get_all]
</span> set human_readable_snapshots {}
foreach snapshot $snapshots {
lappend human_readable_snapshots "[$snapshot note], created at [$snapshot created_at] (ID: [$snapshot id])"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,18 +98,6 @@ namespace eval restore {
</span> return 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- proc fetch_snapshot {snapshot_id} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [registry::snapshot get_by_id $snapshot_id]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc fetch_snapshot_last {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [registry::snapshot get_last]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc list_snapshots {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [registry::snapshot get_all]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> proc sort_portlist_dependencies_later {portlist} {
# Sorts a list of port references such that ports come before
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,13 +270,9 @@ namespace eval restore {
</span> set dependency_types { depends_fetch depends_extract depends_build depends_lib depends_run }
foreach dependency_type $dependency_types {
if {[info exists portinfo($dependency_type)] && [string length $portinfo($dependency_type)] > 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts "==="
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts "dependencies for $portname:"
</span> foreach dependency $portinfo($dependency_type) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts [lindex [split $dependency :] end]
</span> lappend dependency_list [lindex [split $dependency :] end]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts "==="
</span> }
}
return $dependency_list
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e2ff6b9..dc7110e 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2800,7 +2800,6 @@ proc action_snapshot { action portlist opts } {
</span> array set options $opts
if {[info exists options(ports_snapshot_list)]} {
set snapshots [registry::snapshot get_all]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $snapshots
</span> foreach snapshot $snapshots {
puts "[$snapshot note], created at [$snapshot created_at] (ID: [$snapshot id])"
}
</pre><pre style='margin:0'>
</pre>