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

[ijackson at macports.org]

Revision: 137849
          https://trac.macports.org/changeset/137849
Author:   ijackson at macports.org
Date:     2015-06-21 13:31:55 -0700 (Sun, 21 Jun 2015)
Log Message:
-----------
Remove $field == "yes" switch case in libsolv::search
Do not call libsolv search if $field == "yes" as nothing
useful was being done inside libsolv::search when $field
is "yes" and prevent unnecessary computation.

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-06-21 19:27:07 UTC (rev 137848)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports.tcl	2015-06-21 20:31:55 UTC (rev 137849)
@@ -2742,11 +2742,16 @@
     ## Use libsolv search if -l is passed
     if {[info exists macports::global_options(ports_depengine)]} {
         if {$macports::global_options(ports_depengine) eq "libsolv"} {
-            macports::libsolv::create_pool
-            # macports::libsolv::print
-            set search_res [macports::libsolv::search $pattern \
-            $case_sensitive $matchstyle $field]
-            return $search_res
+            ## If $field == "yes" do not call libsolv search
+            #  as nothing useful is done in libsolv search for "yes"
+            #  and save some computation time.
+            if {$field ne "yes"} {
+                macports::libsolv::create_pool
+                # macports::libsolv::print
+                set search_res [macports::libsolv::search $pattern \
+                $case_sensitive $matchstyle $field]
+                return $search_res
+            }
         }
     } else {
         ## Use builtin search algorithm.

Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl
===================================================================
--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl	2015-06-21 19:27:07 UTC (rev 137848)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl	2015-06-21 20:31:55 UTC (rev 137849)
@@ -199,9 +199,6 @@
             categories {
                 set search_option $solv::SOLVABLE_CATEGORY
             }
-            ## $field is yes in alternate iteration i.e. description, yes, name, yes and so on.
-            yes {
-            }
             default {
                 return -code error "Libsolv search: Unsupported field: ${field}."
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150621/e55d2517/attachment.html>