diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-03 16:55:43 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-03 16:55:43 +0100 |
| commit | 3f98071ac5d8ffa722b2cf9c74c9c38bf413f059 (patch) | |
| tree | 494c4af6cfc996d6acd764025bb78f1a1598d5c9 /gnu/packages/patches/python-pbr-fix-man-page-support.patch | |
| parent | 0a77fdf4b8732598e341a6793503ea4847e0c760 (diff) | |
| parent | 2bb12f5a68f6547b3de295c22c2886aaa0415e47 (diff) | |
| download | guix-3f98071ac5d8ffa722b2cf9c74c9c38bf413f059.tar guix-3f98071ac5d8ffa722b2cf9c74c9c38bf413f059.tar.gz | |
Merge branch 'python-tests'
Diffstat (limited to 'gnu/packages/patches/python-pbr-fix-man-page-support.patch')
| -rw-r--r-- | gnu/packages/patches/python-pbr-fix-man-page-support.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/python-pbr-fix-man-page-support.patch b/gnu/packages/patches/python-pbr-fix-man-page-support.patch new file mode 100644 index 0000000000..b9036f5b01 --- /dev/null +++ b/gnu/packages/patches/python-pbr-fix-man-page-support.patch @@ -0,0 +1,28 @@ +See: https://bugs.launchpad.net/oslosphinx/+bug/1661861 +diff -ur orig/pbr-1.10.0/pbr/builddoc.py pbr-1.10.0/pbr/builddoc.py +--- orig/pbr-1.10.0/pbr/builddoc.py 2016-05-23 21:38:18.000000000 +0200 ++++ pbr-1.10.0/pbr/builddoc.py 2017-02-18 14:01:37.424434317 +0100 +@@ -138,7 +138,8 @@ + sphinx_config.init_values(warnings.warn) + else: + sphinx_config.init_values() +- if self.builder == 'man' and len(sphinx_config.man_pages) == 0: ++ if self.builder == 'man' and len( ++ getattr(sphinx_config, 'man_pages', '')) == 0: + return + app = application.Sphinx( + self.source_dir, self.config_dir, +diff -ur orig/pbr-1.10.0/pbr/util.py pbr-1.10.0/pbr/util.py +--- orig/pbr-1.10.0/pbr/util.py 2016-05-23 21:38:18.000000000 +0200 ++++ pbr-1.10.0/pbr/util.py 2017-02-18 15:36:32.951196795 +0100 +@@ -211,7 +211,9 @@ + parser.read(path) + config = {} + for section in parser.sections(): +- config[section] = dict(parser.items(section)) ++ config[section] = dict() ++ for k, value in parser.items(section): ++ config[section][k.replace('-', '_')] = value + + # Run setup_hooks, if configured + setup_hooks = has_get_option(config, 'global', 'setup_hooks') |