[139300] branches/gsoc15-dependency/base/src/macports1.0

[ijackson at macports.org]

Revision: 139300
          https://trac.macports.org/changeset/139300
Author:   ijackson at macports.org
Date:     2015-08-11 08:51:45 -0700 (Tue, 11 Aug 2015)
Log Message:
-----------
Add user confirmation option while installing using libsolv.

Remove puts statements added previously for debugging purposes.

Modified Paths:
--------------
    branches/gsoc15-dependency/base/src/macports1.0/macports.tcl
    branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl

Modified: branches/gsoc15-dependency/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc15-dependency/base/src/macports1.0/macports.tcl	2015-08-11 15:31:21 UTC (rev 139299)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports.tcl	2015-08-11 15:51:45 UTC (rev 139300)
@@ -2038,14 +2038,12 @@
                 set porturl [lindex $port 1]
                 set options(subport) $portname
                 
-                puts "Current: $portname"  
                 set mport [mportopen $porturl [list subport $portname]]
                 foreach dep [$portsolv lookup_deparray $solv::SOLVABLE_REQUIRES] {
                     set depname [$dep __str__]
                     if {$depname ni $portlist} {
                         continue
                     }
-                    puts "Adding $depname to requires"
                     ditem_append_unique $mport requires $depname
                 }
                 lappend dlist $mport

Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl
===================================================================
--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl	2015-08-11 15:31:21 UTC (rev 139299)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl	2015-08-11 15:51:45 UTC (rev 139300)
@@ -406,7 +406,7 @@
             | $solv::Transaction_SOLVER_TRANSACTION_OBSOLETE_IS_UPGRADE] 
         
         set install_list [list]
-
+        set dep_list [list]
         foreach cl [$trans classify $clflag] {
             if {[$cl cget -type] == $solv::Transaction_SOLVER_TRANSACTION_ERASE} {
                 puts "[$cl cget -count] Erased packages:"
@@ -435,6 +435,7 @@
                         puts "[$p __str__] -> [$op __str__]"
                 } else {
                     puts [$p __str__]
+                    lappend dep_list [$p __str__]
                     array set portinfo $portindexinfo([$p cget -id])
                     set porturl "file://[[$p cget -repo] cget -name]/${portinfo(portdir)}"
                     lappend install_list [list $p $porturl] 
@@ -442,6 +443,14 @@
                 }
             }
         }
+        if {[info exists macports::ui_options(questions_yesno)]} {
+            set retvalue [$macports::ui_options(questions_yesno) "The following dependencies will be installed by libsolv: " "" [lsort $dep_list] {y} 0]
+            if {$retvalue == 1} {
+                return {}
+            }
+        } else {
+            set depstring "$macports::ui_prefix Dependencies to be installed by libsolv:"
+        }
         return $install_list
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150811/4297b3d0/attachment.html>