Changeset 79421

Timestamp:

06/13/11 00:25:18 (4 years ago)

Author:

jmr@…

Message:

add 'actinact' pseudo-portname that expands to ports with both active and inactive versions (#27666)

Location:

trunk/base

Files:

• doc/port.1 (modified) (1 diff)
• src/port/port.tcl (modified) (3 diffs)

trunk/base/doc/port.1

@@ -103 +103 @@
 .Ar inactive :
 set of installed but inactive ports.
+.Pp
+.It
+.Ar actinact :
+set of installed ports that have both an active version and one or more inactive versions.
 .Pp
 .It

trunk/base/src/port/port.tcl

@@ -88 +88 @@
 Pseudo-portnames are words that may be used in place of a portname, and
 which expand to some set of ports. The common pseudo-portnames are:
-all, current, active, inactive, installed, uninstalled, outdated, obsolete,
-requested, unrequested and leaves.
+all, current, active, inactive, actinact, installed, uninstalled, outdated,
+obsolete, requested, unrequested and leaves.
 These pseudo-portnames expand to the set of ports named.
 
@@ -765 +765 @@
 }
 
+proc get_actinact_ports {} {
+    set inactive_ports [get_inactive_ports]
+    set active_ports [get_active_ports]
+    set results {}
+
+    foreach port $inactive_ports {
+        array set portspec $port
+        set portname $portspec(name)
+        lappend inact($portname) $port
+    }
+
+    foreach port $active_ports {
+        array set portspec $port
+        set portname $portspec(name)
+
+        if {[info exists inact($portname)]} {
+            if {![info exists added_inact($portname)]} {
+                foreach inact_spec $inact($portname) {
+                    lappend results $inact_spec
+                }
+                set added_inact($portname) 1
+            }
+            lappend results $port
+        }
+    }
+    return $results
+}
+
 
 proc get_outdated_ports {} {
@@ -1215 +1243 @@
         ^active(@.*)?$      -
         ^inactive(@.*)?$    -
+        ^actinact(@.*)?$    -
         ^leaves(@.*)?$      -
         ^outdated(@.*)?$    -