<!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>[68670] trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff</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/68670">68670</a></dd>
<dt>Author</dt> <dd>blair@macports.org</dd>
<dt>Date</dt> <dd>2010-06-09 12:37:25 -0700 (Wed, 09 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Follow up to <a href="http://trac.macports.org/changeset/67692">r67692</a>, remove a patch that is no longer referenced by
the Portfile.</pre>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelicepythonfilespatchscriptsTestUtilpydiff">trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelicepythonfilespatchscriptsTestUtilpydiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff (68669 => 68670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff 2010-06-09 19:33:13 UTC (rev 68669)
+++ trunk/dports/devel/ice-python/files/patch-scripts.TestUtil.py.diff 2010-06-09 19:37:25 UTC (rev 68670)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-diff -ru ../Ice-3.3.1.orig/scripts/TestUtil.py ./scripts/TestUtil.py
---- ../Ice-3.3.1.orig/scripts/TestUtil.py 2009-03-20 10:52:15.000000000 -0700
-+++ ./scripts/TestUtil.py 2009-04-05 01:51:26.000000000 -0700
-@@ -727,7 +727,7 @@
- print >>output, "-Djava.net.preferIPv4Stack=true",
- print >>output, exe,
- elif config.lang == "py":
-- print >>output, "python", exe,
-+ print >>output, sys.executable, exe,
- elif config.lang == "php" and config.type == "client":
- print >>output, phpCmd, "-c tmp.ini -f", exe, " -- ",
- elif config.lang == "cpp" and config.valgrind:
-@@ -1186,13 +1186,13 @@
-
- global keepGoing
- if script:
-- print "if ! python %s %s; then" % (os.path.join(dir, "run.py"), args)
-+ print "if ! %s %s %s; then" % (sys.executable, os.path.join(dir, "run.py"), args)
- print " echo 'test in %s failed'" % os.path.abspath(dir)
- if not keepGoing:
- print " exit 1"
- print "fi"
- else:
-- status = os.system("python " + os.path.join(dir, "run.py " + args))
-+ status = os.system(sys.executable + " " + os.path.join(dir, "run.py " + args))
-
- if status:
- if(num > 0):
</del></span></pre>
</div>
</div>
</body>
</html>