<!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>[141271] trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl</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="https://trac.macports.org/changeset/141271">141271</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2015-10-13 20:36:25 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>active_variants PortGroup:
* Perform a check in the activate phase too, to catch the case that a port was deactivated, a dependency was installed with problematic variants, and then the port was reactivated. In this case a warning is written.
* Typos.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupactive_variants11tcl">trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupactive_variants11tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl (141270 => 141271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2015-10-14 03:34:29 UTC (rev 141270)
+++ trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2015-10-14 03:36:25 UTC (rev 141271)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> # $required
</span><span class="cx"> # is a list of variants that must be enabled for the test to succeed
</span><span class="cx"> # (required; remember this can also be a space-separated string or just
</span><del>-# a string for a single value. It's iterpreted as list, though.)
</del><ins>+# a string for a single value. It's interpreted as list, though.)
</ins><span class="cx"> # $forbidden
</span><span class="cx"> # is a list of variants that may not be enabled for the test to succeed
</span><span class="cx"> # (default is empty list, see description of $required for values that can be
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> # }
</span><span class="cx"> #
</span><span class="cx"> # If all you want to do is bail out when the condition isn't fulfilled, there's
</span><del>-# a convience wrapper available. If the condition isn't met it will print an
</del><ins>+# a convenience wrapper available. If the condition isn't met it will print an
</ins><span class="cx"> # error message and exit in a pre-configure phase. This can't be run any
</span><span class="cx"> # earlier, because not all dependency types are installed before configure
</span><span class="cx"> # phase. Previous versions of this PortGroup required you to manually put
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# global list holding all items the should be checked for and cause an error if
</del><ins>+# global list holding all items should be checked for and cause an error if
</ins><span class="cx"> # not present
</span><span class="cx"> set _require_active_variants_list [list]
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,8 @@
</span><span class="cx"> source {
</span><span class="cx"> set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run"
</span><span class="cx"> }
</span><del>- archivefetch {
</del><ins>+ activate -
+ archivefetch {
</ins><span class="cx"> set deptypes "depends_lib depends_run"
</span><span class="cx"> }
</span><span class="cx"> default {
</span><span class="lines">@@ -197,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> # for each type we're considering
</span><span class="cx"> foreach deptype $deptypes {
</span><del>- # check that there are any dependencies by that type
</del><ins>+ # check whether there are any dependencies of that type
</ins><span class="cx"> if {[info exists PortInfo($deptype)]} {
</span><span class="cx"> # and for each dependency
</span><span class="cx"> foreach depspec $PortInfo($deptype) {
</span><span class="lines">@@ -231,7 +232,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[catch {set result [active_variants $depspec $required $forbidden]}] != 0} {
</span><del>- error "${port} is required, but not active."
</del><ins>+ set message "${port} is required, but not active."
+ if {$method == activate} {
+ ui_msg "Warning: $message"
+ } else {
+ error "$message"
+ }
</ins><span class="cx"> }
</span><span class="cx"> if {!$result} {
</span><span class="cx"> set str_required ""
</span><span class="lines">@@ -246,7 +252,12 @@
</span><span class="cx"> if {$str_required != "" && $str_forbidden != ""} {
</span><span class="cx"> set str_combine " and "
</span><span class="cx"> }
</span><del>- error "${port} must be installed ${str_required}${str_combine}${str_forbidden}."
</del><ins>+ set message "${port} must be installed ${str_required}${str_combine}${str_forbidden}."
+ if {$method == "activate"} {
+ ui_msg "Warning: $message"
+ } else {
+ error "$message"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -262,3 +273,8 @@
</span><span class="cx"> pre-archivefetch {
</span><span class="cx"> _check_require_active_variants archivefetch
</span><span class="cx"> }
</span><ins>+
+# be sure that a required variant was not changed since this port was built or fetched
+pre-activate {
+ _check_require_active_variants activate
+}
</ins></span></pre>
</div>
</div>
</body>
</html>