<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[65546] trunk/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/65546">65546</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2010-03-27 01:06:37 -0700 (Sat, 27 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add requested/unrequested pseudo-ports and setrequested/unsetrequested actions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
<li><a href="#trunkbasesrcregistry20receipt_sqlitetcl">trunk/base/src/registry2.0/receipt_sqlite.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (65545 => 65546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2010-03-27 07:54:36 UTC (rev 65545)
+++ trunk/base/src/port/port.tcl 2010-03-27 08:06:37 UTC (rev 65546)
</span><span class="lines">@@ -820,7 +820,43 @@
</span><span class="cx"> return [portlist_sort $results]
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# return ports that have registry property $propname set to $propval
+proc get_ports_with_prop {propname propval} {
+ set ilist {}
+ if { [catch {set ilist [registry::installed]} result] } {
+ if {$result != "Registry error: No ports registered as installed."} {
+ global errorInfo
+ ui_debug "$errorInfo"
+ fatal "port installed failed: $result"
+ }
+ }
</ins><span class="cx">
</span><ins>+ set results {}
+ foreach i $ilist {
+ set iname [lindex $i 0]
+ set iversion [lindex $i 1]
+ set irevision [lindex $i 2]
+ set ivariants [lindex $i 3]
+ set iepoch [lindex $i 5]
+ set regref [registry::open_entry $iname $iversion $irevision $ivariants $iepoch]
+ if {[registry::property_retrieve $regref $propname] == $propval} {
+ add_to_portlist results [list name $iname version "${iversion}_${irevision}" variants [split_variants $ivariants]]
+ }
+ }
+
+ # Return the list of ports, sorted
+ return [portlist_sort $results]
+}
+
+proc get_requested_ports {} {
+ return [get_ports_with_prop requested 1]
+}
+
+proc get_unrequested_ports {} {
+ return [get_ports_with_prop requested 0]
+}
+
+
</ins><span class="cx"> ##########################################
</span><span class="cx"> # Port expressions
</span><span class="cx"> ##########################################
</span><span class="lines">@@ -967,6 +1003,8 @@
</span><span class="cx"> ^inactive(@.*)?$ -
</span><span class="cx"> ^outdated(@.*)?$ -
</span><span class="cx"> ^obsolete(@.*)?$ -
</span><ins>+ ^requested(@.*)?$ -
+ ^unrequested(@.*)?$ -
</ins><span class="cx"> ^current(@.*)?$ {
</span><span class="cx"> # A simple pseudo-port name
</span><span class="cx"> advance
</span><span class="lines">@@ -2183,6 +2221,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+proc action_setrequested { action portlist opts } {
+ set status 0
+ if {[require_portlist portlist]} {
+ return 1
+ }
+ # set or unset?
+ set val [string equal $action setrequested]
+ foreachport $portlist {
+ set composite_version [composite_version $portversion [array get variations]]
+ if {![catch {set ilist [registry::installed $portname $composite_version]}]} {
+ ui_info "Setting requested flag for $portname to $val"
+ foreach i $ilist {
+ set regref [registry::entry open $portname [lindex $i 1] [lindex $i 2] [lindex $i 3] [lindex $i 5]]
+ registry::property_store $regref requested $val
+ }
+ } else {
+ global errorInfo
+ ui_debug "$errorInfo"
+ break_softcontinue "$result" 1 status
+ }
+ }
+
+ return $status
+}
+
+
</ins><span class="cx"> proc action_upgrade { action portlist opts } {
</span><span class="cx"> if {[require_portlist portlist]} {
</span><span class="cx"> return 1
</span><span class="lines">@@ -3232,6 +3296,9 @@
</span><span class="cx"> sync [list action_sync [ACTION_ARGS_NONE]] \
</span><span class="cx"> selfupdate [list action_selfupdate [ACTION_ARGS_NONE]] \
</span><span class="cx"> \
</span><ins>+ setrequested [list action_setrequested [ACTION_ARGS_PORTS]] \
+ unsetrequested [list action_setrequested [ACTION_ARGS_PORTS]] \
+ \
</ins><span class="cx"> upgrade [list action_upgrade [ACTION_ARGS_PORTS]] \
</span><span class="cx"> \
</span><span class="cx"> version [list action_version [ACTION_ARGS_NONE]] \
</span></span></pre></div>
<a id="trunkbasesrcregistry20receipt_sqlitetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/receipt_sqlite.tcl (65545 => 65546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/receipt_sqlite.tcl 2010-03-27 07:54:36 UTC (rev 65545)
+++ trunk/base/src/registry2.0/receipt_sqlite.tcl 2010-03-27 08:06:37 UTC (rev 65546)
</span><span class="lines">@@ -137,6 +137,30 @@
</span><span class="cx"> return $ret
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+##
+# Store a property in a registry entry.
+#
+# ref reference to the entry.
+# property key for the property to set.
+# value value to set it to.
+proc property_store {ref property value} {
+ switch $property {
+ active {
+ if {!$value} {
+ $ref state "imaged"
+ } else {
+ $ref state "installed"
+ }
+ }
+ imagedir {
+ $ref location $value
+ }
+ default {
+ $ref $property $value
+ }
+ }
+}
+
</ins><span class="cx"> # Return installed ports
</span><span class="cx"> #
</span><span class="cx"> # If version is "", return all ports of that name.
</span></span></pre>
</div>
</div>
</body>
</html>