Remove broken rst with latest docutils

* Remove broken rst with latest docutils (Closes: #850231).

Change-Id: Ibe6fa8f8248dc6d7fcc62786b961488b43dbc429
This commit is contained in:
Thomas Goirand 2017-01-08 13:37:00 +01:00
parent 3ab0b42ffb
commit 9da81d0d71
3 changed files with 30 additions and 0 deletions

1
debian/changelog vendored
View File

@ -6,6 +6,7 @@ heat (1:7.0.0-2) unstable; urgency=medium
[ Thomas Goirand ]
* CVE-2016-9185: template source URL allows network port scan: applied
upstream patch (Closes: #843232).
* Remove broken rst with latest docutils (Closes: #850231).
-- Thomas Goirand <zigo@debian.org> Mon, 26 Dec 2016 17:36:59 +0100

28
debian/patches/remove-broken-rst.patch vendored Normal file
View File

@ -0,0 +1,28 @@
Description: Remove broken RST
In hot_spec.rst, there's some lines that are FTBFS with the newer docutils.
Since it doesn't seem that important, and it's best to keep the rest of the
documentation, we're just removing the block.
Author: Thomas Goirand <zigo@debian.org>
Bug-Debian: https://bugs.debian.org/850231
Forwarded: no
Last-Update: 2017-01-08
--- heat-7.0.0.orig/doc/source/template_guide/hot_spec.rst
+++ heat-7.0.0/doc/source/template_guide/hot_spec.rst
@@ -592,16 +592,6 @@ For example
constraints:
- custom_constraint: nova.keypair
-The following section lists the custom constraints and the plug-ins
-that support them.
-
-.. table_from_text:: ../../setup.cfg
- :header: Name,Plug-in
- :regex: (.*)=(.*)
- :start-after: heat.constraints =
- :end-before: heat.stack_lifecycle_plugins =
- :sort:
-
.. _hot_spec_pseudo_parameters:
Pseudo parameters

View File

@ -1,3 +1,4 @@
only-run-tests-in-heat.tests.patch
fix-requirements.txt.patch
CVE-2016-9185_Prevent_template_validate_from_scanning_ports.patch
remove-broken-rst.patch