From 19fba83f36d681a9939a994339a05bbcf75690fc Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Wed, 18 Nov 2015 10:14:34 +0100
Subject: [PATCH] diff_branches: fix deprecated opts listing

* Use the proper list (deprecated_opts, not new_opts)
* Sort the elements

Change-Id: I2f16ee72ed389b801590db70708db1bd4d59f88d
---
 autogenerate_config_docs/diff_branches.py         | 3 ++-
 autogenerate_config_docs/templates/changes.rst.j2 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/autogenerate_config_docs/diff_branches.py b/autogenerate_config_docs/diff_branches.py
index 4dcca04b..883c9e8e 100755
--- a/autogenerate_config_docs/diff_branches.py
+++ b/autogenerate_config_docs/diff_branches.py
@@ -237,7 +237,8 @@ def get_env(project, new_branch, old_list, new_list):
 
     # Deprecated options
     if deprecated_opts:
-        for deprecated, new in deprecated_opts:
+        for deprecated, new in sorted(deprecated_opts, cmp=_cmpopts,
+                                      key=lambda tup: tup[0]):
             deprecated = format_option_name(deprecated)
             new = format_option_name(new)
             env['deprecated_opts'].append((deprecated, new))
diff --git a/autogenerate_config_docs/templates/changes.rst.j2 b/autogenerate_config_docs/templates/changes.rst.j2
index 44afe72c..651c4126 100644
--- a/autogenerate_config_docs/templates/changes.rst.j2
+++ b/autogenerate_config_docs/templates/changes.rst.j2
@@ -41,7 +41,7 @@ New, updated, and deprecated options in {{ release }} for {{ codename }}
 
    * - Deprecated option
      - New Option
-{% for cells in new_opts %}
+{% for cells in deprecated_opts %}
    * - ``{{ cells[0] }}``
      - ``{{ cells[1] }}``
 {% endfor %}