[152962] trunk/dports/devel/osc

[raimue at macports.org]

Revision: 152962
          https://trac.macports.org/changeset/152962
Author:   raimue at macports.org
Date:     2016-09-21 03:57:31 -0700 (Wed, 21 Sep 2016)
Log Message:
-----------
devel/osc: update to version 0.155.0

Recreate patches disabling build command after discussion with upstream.

Modified Paths:
--------------
    trunk/dports/devel/osc/Portfile
    trunk/dports/devel/osc/files/patch-config.diff

Added Paths:
-----------
    trunk/dports/devel/osc/files/patch-build-disable.diff

Removed Paths:
-------------
    trunk/dports/devel/osc/files/patch-build-none.diff

Modified: trunk/dports/devel/osc/Portfile
===================================================================
--- 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)
@@ -5,8 +5,7 @@
 PortGroup           github 1.0
 PortGroup           python 1.0
 
-github.setup        openSUSE osc 0.152.0
-revision            2
+github.setup        openSUSE osc 0.155.0
 categories          devel python
 platforms           darwin
 supported_archs     noarch
@@ -23,11 +22,11 @@
 
 homepage            https://en.opensuse.org/openSUSE:OSC
 
-checksums           rmd160  d8d27490461c03a1afeb503943ad747d3f005f6d \
-                    sha256  42c0cbf85e34802f16bd5f6ecd038a48ca8461937690634ccad5168f404a4c8f
+checksums           rmd160  5c4826cf9e289913cadf71bb786182fa5394159d \
+                    sha256  80d2a1d5f85c9f4162abfb49d4e99367b1c6c04daa3177cae23135eebf5d2acc
 
 patchfiles          patch-config.diff \
-                    patch-build-none.diff
+                    patch-build-disable.diff
 
 python.default_version 27
 

Copied: trunk/dports/devel/osc/files/patch-build-disable.diff (from rev 152961, trunk/dports/devel/osc/files/patch-build-none.diff)
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+--- 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)

Deleted: trunk/dports/devel/osc/files/patch-build-none.diff
===================================================================
--- 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)
@@ -1,13 +0,0 @@
---- 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)

Modified: trunk/dports/devel/osc/files/patch-config.diff
===================================================================
--- 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)
@@ -1,16 +1,5 @@
 --- osc/conf.py.orig	2015-10-10 16:58:32.000000000 +0200
 +++ osc/conf.py	2015-11-14 16:26:40.000000000 +0100
-@@ -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
 @@ -175,7 +175,7 @@
              'maintained_update_project_attribute': 'OBS:UpdateProject',
              'show_download_progress': '0',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160921/1ddf9edb/attachment-0001.html>