<!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>[152962] trunk/dports/devel/osc</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/152962">152962</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-21 03:57:31 -0700 (Wed, 21 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>devel/osc: update to version 0.155.0
Recreate patches disabling build command after discussion with upstream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdeveloscPortfile">trunk/dports/devel/osc/Portfile</a></li>
<li><a href="#trunkdportsdeveloscfilespatchconfigdiff">trunk/dports/devel/osc/files/patch-config.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdeveloscfilespatchbuilddisablediff">trunk/dports/devel/osc/files/patch-build-disable.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdeveloscfilespatchbuildnonediff">trunk/dports/devel/osc/files/patch-build-none.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdeveloscPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/osc/Portfile (152961 => 152962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/osc/Portfile 2016-09-21 10:38:42 UTC (rev 152961)
+++ trunk/dports/devel/osc/Portfile 2016-09-21 10:57:31 UTC (rev 152962)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><del>-github.setup openSUSE osc 0.152.0
-revision 2
</del><ins>+github.setup openSUSE osc 0.155.0
</ins><span class="cx"> categories devel python
</span><span class="cx"> platforms darwin
</span><span class="cx"> supported_archs noarch
</span><span class="lines">@@ -23,11 +22,11 @@
</span><span class="cx">
</span><span class="cx"> homepage https://en.opensuse.org/openSUSE:OSC
</span><span class="cx">
</span><del>-checksums rmd160 d8d27490461c03a1afeb503943ad747d3f005f6d \
- sha256 42c0cbf85e34802f16bd5f6ecd038a48ca8461937690634ccad5168f404a4c8f
</del><ins>+checksums rmd160 5c4826cf9e289913cadf71bb786182fa5394159d \
+ sha256 80d2a1d5f85c9f4162abfb49d4e99367b1c6c04daa3177cae23135eebf5d2acc
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-config.diff \
</span><del>- patch-build-none.diff
</del><ins>+ patch-build-disable.diff
</ins><span class="cx">
</span><span class="cx"> python.default_version 27
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdeveloscfilespatchbuilddisabledifffromrev152961trunkdportsdeveloscfilespatchbuildnonediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/osc/files/patch-build-disable.diff (from rev 152961, trunk/dports/devel/osc/files/patch-build-none.diff) (0 => 152962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/osc/files/patch-build-disable.diff (rev 0)
+++ trunk/dports/devel/osc/files/patch-build-disable.diff 2016-09-21 10:57:31 UTC (rev 152962)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- osc/commandline.py.orig 2016-01-31 15:57:15.000000000 +0100
++++ osc/commandline.py 2016-01-31 16:00:39.000000000 +0100
+@@ -5656,6 +5656,9 @@
+
+ import osc.build
+
++ print('Error: build command has been disabled for this platform, cannot run local builds', file=sys.stderr)
++ return 1
++
+ if which(conf.config['build-cmd']) is None:
+ print('Error: build (\'%s\') command not found' % conf.config['build-cmd'], file=sys.stderr)
+ print('Install the build package from http://download.opensuse.org/repositories/openSUSE:/Tools/', file=sys.stderr)
</ins></span></pre></div>
<a id="trunkdportsdeveloscfilespatchbuildnonediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/osc/files/patch-build-none.diff (152961 => 152962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/osc/files/patch-build-none.diff 2016-09-21 10:38:42 UTC (rev 152961)
+++ trunk/dports/devel/osc/files/patch-build-none.diff 2016-09-21 10:57:31 UTC (rev 152962)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- osc/commandline.py.orig 2016-01-31 15:57:15.000000000 +0100
-+++ osc/commandline.py 2016-01-31 16:00:39.000000000 +0100
-@@ -5656,6 +5656,10 @@
-
- import osc.build
-
-+ if conf.config['build-type'] and conf.config['build-type'] == "none":
-+ print('Error: build command has been disabled for this platform, cannot run local builds')
-+ return 1
-+
- if which(conf.config['build-cmd']) is None:
- print('Error: build (\'%s\') command not found' % conf.config['build-cmd'], file=sys.stderr)
- print('Install the build package from http://download.opensuse.org/repositories/openSUSE:/Tools/', file=sys.stderr)
</del></span></pre></div>
<a id="trunkdportsdeveloscfilespatchconfigdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/osc/files/patch-config.diff (152961 => 152962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/osc/files/patch-config.diff 2016-09-21 10:38:42 UTC (rev 152961)
+++ trunk/dports/devel/osc/files/patch-config.diff 2016-09-21 10:57:31 UTC (rev 152962)
</span><span class="lines">@@ -1,16 +1,5 @@
</span><span class="cx"> --- osc/conf.py.orig 2015-10-10 16:58:32.000000000 +0200
</span><span class="cx"> +++ osc/conf.py 2015-11-14 16:26:40.000000000 +0100
</span><del>-@@ -102,8 +102,8 @@
- 'su-wrapper': 'sudo',
-
- # build type settings
-- 'build-cmd': '/usr/bin/build',
-- 'build-type': '', # may be empty for chroot, kvm or xen
-+ 'build-cmd': '',
-+ 'build-type': 'none', # may be empty for chroot, kvm or xen, none to disable local builds
- 'build-root': '/var/tmp/build-root/%(repo)s-%(arch)s',
- 'build-uid': '', # use the default provided by build
- 'build-device': '', # required for VM builds
</del><span class="cx"> @@ -175,7 +175,7 @@
</span><span class="cx"> 'maintained_update_project_attribute': 'OBS:UpdateProject',
</span><span class="cx"> 'show_download_progress': '0',
</span></span></pre>
</div>
</div>
</body>
</html>