File 0001-Don-t-raise-exception-on-missing-man-pages... of Package python-pbr

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Don-t-raise-exception-on-missing-man-pages.patch of Package python-pbr (Revision 90cb11c5ddc5694479846b8e9140a9b5)

Currently displaying revision 90cb11c5ddc5694479846b8e9140a9b5 , Show latest

From 9fd7aa2cc7fe50f68bd9c86c3db7a8f7ae710c05 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 21 Dec 2016 23:29:52 +0100
Subject: [PATCH] Don't raise exception on missing man pages

The revert in Ia6cfbfe5b10a5b714fbb9f21ca61380aaf231638 actually
broke Sphinx 1.3.x support again. Try to fix it for real this
time by avoiding an exception on missing man_pages.

NOTE(dmllr): don't change dict while iterating over it, hopefully
this fixes the gating failure with python 3.5.x

Change-Id: I52d45fa0a0d42de690d3a492068f7bb03483a224
Related-Bug: 1379998
---
 pbr/builddoc.py | 3 ++-
 pbr/util.py     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

Index: pbr-1.10.0/pbr/builddoc.py
===================================================================
--- pbr-1.10.0.orig/pbr/builddoc.py
+++ pbr-1.10.0/pbr/builddoc.py
@@ -138,7 +138,8 @@ class LocalBuildDoc(setup_command.BuildD
             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,
Index: pbr-1.10.0/pbr/util.py
===================================================================
--- pbr-1.10.0.orig/pbr/util.py
+++ pbr-1.10.0/pbr/util.py
@@ -211,9 +211,9 @@ def cfg_to_args(path='setup.cfg', script
     parser.read(path)
     config = {}
     for section in parser.sections():
-        config[section] = dict(parser.items(section))
-        for k in config[section]:
-            config[section][k.replace('-', '_')] = config[section].pop(k)
+        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')

Places

File 0001-Don-t-raise-exception-on-missing-man-pages.patch of Package python-pbr (Revision 90cb11c5ddc5694479846b8e9140a9b5)

Places