Attachment 164235 Details for Bug 204992 – patch

[patch] patch

pbr.diff (text/plain), 3.78 KB, created by Kurt Jaeger on 2015-12-14 17:12:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-12-14 17:12:32 UTC

Size: 3.78 KB

patch

obsolete

>diff -r -u -N devel/py-pbr/Makefile ../../home/pi/myp/devel/py-pbr/Makefile
>--- devel/py-pbr/Makefile	2015-08-31 21:04:45.312698000 +0200
>+++ ../../home/pi/myp/devel/py-pbr/Makefile	2015-12-14 18:10:17.869655000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/py-pbr/Makefile 395669 2015-08-31 12:44:05Z koobs $
> 
> PORTNAME=	pbr
>-PORTVERSION=	1.6.0
>+PORTVERSION=	1.8.1
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -r -u -N devel/py-pbr/distinfo ../../home/pi/myp/devel/py-pbr/distinfo
>--- devel/py-pbr/distinfo	2015-08-31 21:04:45.314000000 +0200
>+++ ../../home/pi/myp/devel/py-pbr/distinfo	2015-12-14 18:10:20.191525000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (pbr-1.6.0.tar.gz) = 4eaee8ff5544703edd1951ed1dc0b283da99a74f740d9f9055eeefcf329de1d1
>-SIZE (pbr-1.6.0.tar.gz) = 99945
>+SHA256 (pbr-1.8.1.tar.gz) = e2127626a91e6c885db89668976db31020f0af2da728924b56480fc7ccf09649
>+SIZE (pbr-1.8.1.tar.gz) = 104584
>diff -r -u -N devel/py-pbr/files/patch-pbr_builddoc.py ../../home/pi/myp/devel/py-pbr/files/patch-pbr_builddoc.py
>--- devel/py-pbr/files/patch-pbr_builddoc.py	2015-08-31 21:04:45.315253000 +0200
>+++ ../../home/pi/myp/devel/py-pbr/files/patch-pbr_builddoc.py	1970-01-01 01:00:00.000000000 +0100
>@@ -1,59 +0,0 @@
>-From 12e36886fe343f8103a21c60d6925115ad8dbc26 Mon Sep 17 00:00:00 2001
>-From: Thomas Bechtold <tbechtold@suse.com>
>-Date: Tue, 2 Jun 2015 18:40:38 +0200
>-Subject: [PATCH] Remove sphinx_config.init_values() manual call
>-
>-The function signature for Sphinx's config.init_values() changed since
>-version 1.3. That leads to:
>-
>-TypeError: init_values() takes exactly 2 arguments (1 given)
>-
>-But the function is already correctly called from
>-application.Sphinx()'s constructor. So use the configuration object
>-from the application instead of creating an own config object.
>-
>-Commit 1dfe9ef348c777bef67b2c2b1d35e50ebc720333 already introduced this
>-change and commit e41a9180ed3103bb45fa1d1be93ba951016b029c reverted it
>-due to build failures with Sphinx 1.1.3 . The failure occurred because
>-using the application class to detect if man pages can build raised a
>-warning which was treated as error. This case is now handled and tested
>-with Sphinx 1.1.3 and 1.3.1.
>-
>-Change-Id: Idf6c7b329880c6698b61ee9e88f29c0f6e0956bf
>-Closes-Bug: #1379998
>-
>---- pbr/builddoc.py.orig	2015-08-24 21:30:59 UTC
>-+++ pbr/builddoc.py
>-@@ -27,7 +27,6 @@ except ImportError:
>- try:
>-     from sphinx import apidoc
>-     from sphinx import application
>--    from sphinx import config
>-     from sphinx import setup_command
>- except Exception as e:
>-     # NOTE(dhellmann): During the installation of docutils, setuptools
>-@@ -129,10 +128,21 @@ class LocalBuildDoc(setup_command.BuildD
>-             confoverrides['release'] = self.release
>-         if self.today:
>-             confoverrides['today'] = self.today
>--        sphinx_config = config.Config(self.config_dir, 'conf.py', {}, [])
>--        sphinx_config.init_values()
>--        if self.builder == 'man' and len(sphinx_config.man_pages) == 0:
>-+
>-+        # NOTE(toabctl): creating the app with "warningiserror=False" is
>-+        # used to detect if man_pages are available.Only needed for sphinx<1.3
>-+        # See also https://github.com/sphinx-doc/sphinx/issues/1933
>-+        app = application.Sphinx(
>-+            self.source_dir, self.config_dir,
>-+            self.builder_target_dir, self.doctree_dir,
>-+            self.builder, confoverrides, status_stream,
>-+            freshenv=self.fresh_env, warningiserror=False)
>-+
>-+        if self.builder == 'man' and len(app.config.man_pages) == 0:
>-             return
>-+
>-+        # NOTE(toabctl): Now create the app with "warningiserror=True for real
>-+        # usage
>-         app = application.Sphinx(
>-             self.source_dir, self.config_dir,
>-             self.builder_target_dir, self.doctree_dir,

Actions: View | Diff

Attachments on bug 204992: 164235