From 16138e6ff95f31822d712225ab7d238ec2faa8d4 Mon Sep 17 00:00:00 2001
From: Adrian Mangeac <Adrian.Mangeac@enea.com>
Date: Fri, 4 Oct 2019 14:10:43 +0200
Subject: Add new information to added/removed packages

Update the added and removed packages tables with two new columns. The
information should give an idea about why the package was added/removed.

Change-Id: Ibae097fa5cab4f8b3962aadcbf8603d778d97e2c
Signed-off-by: Adrian Mangeac <Adrian.Mangeac@enea.com>
---
 doc/gen_pkgdiff.py | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/doc/gen_pkgdiff.py b/doc/gen_pkgdiff.py
index 7697469..5baa08e 100644
--- a/doc/gen_pkgdiff.py
+++ b/doc/gen_pkgdiff.py
@@ -90,10 +90,12 @@ def get_pkgs(file_spec):
     for row in tab:
         pname = row[0].text
         pver  = row[1].text
+        pdesc  = row[2].text
         if not pname in plist:
-            plist[pname] = set()
+            plist[pname] = list()
 
-        plist[pname].add(pver)
+        plist[pname].append(pver)
+        plist[pname].append(pdesc)
 
     return set(plist), plist
 
@@ -159,19 +161,28 @@ print '  <section id="relinfo-added-packages">'
 print '    <title>Added Packages</title>'
 print '    <para>The following packages were added to this Enea Linux release:</para>'
 print '    <informaltable>'
-print '      <tgroup cols="2">'
+print '      <tgroup cols="4">'
+print '        <colspec colwidth="2*"/>'
+print '        <colspec colwidth="1*"/>'
+print '        <colspec colwidth="5*"/>'
+print '        <colspec colwidth="2*"/>'
 print '        <thead>'
 print '          <row>'
 print '            <entry>Package</entry>'
 print '            <entry>Version(s)</entry>'
+print '            <entry>Description</entry>'
+print '            <entry>Comment</entry>'
 print '          </row>'
 print '        </thead>'
 print '        <tbody>'
 
 for p in sorted(list(added)):
+    new_p = new_pdict[p]
     print '          <row>'
     print '            <entry>%s</entry>' % p
-    print '            <entry>%s</entry>' % ", ".join(sorted(new_pdict[p]))
+    print '            <entry>%s</entry>' % new_p[0]
+    print '            <entry>%s</entry>' % new_p[1]
+    print '            <entry></entry>'
     print '          </row>'
 
 print '        </tbody>'
@@ -183,18 +194,27 @@ print '  <section id="relinfo-removed-packages">'
 print '    <title>Removed Packages</title>'
 print '    <para>The following packages were removed from this Enea Linux release:</para>'
 print '    <informaltable>'
-print '      <tgroup cols="2">'
+print '      <tgroup cols="4">'
+print '        <colspec colwidth="2*"/>'
+print '        <colspec colwidth="1*"/>'
+print '        <colspec colwidth="5*"/>'
+print '        <colspec colwidth="2*"/>'
 print '        <thead>'
 print '          <row>'
 print '            <entry>Package</entry>'
 print '            <entry>Version(s)</entry>'
+print '            <entry>Description</entry>'
+print '            <entry>Comment</entry>'
 print '          </row>'
 print '        </thead>'
 print '        <tbody>'
 for p in sorted(list(removed)):
+    old_p = old_pdict[p]
     print '          <row>'
     print '            <entry>%s</entry>' % p
-    print '            <entry>%s</entry>' % ", ".join(sorted(old_pdict[p]))
+    print '            <entry>%s</entry>' % old_p[0]
+    print '            <entry>%s</entry>' % old_p[1]
+    print '            <entry></entry>'
     print '          </row>'
 print '        </tbody>'
 print '      </tgroup>'
@@ -215,10 +235,12 @@ print '          </row>'
 print '        </thead>'
 print '        <tbody>'
 for p in sorted(list(changed)):
+    old_p = old_pdict[p]
+    new_p = new_pdict[p]
     print '          <row>'
     print '            <entry>%s</entry>' % p
-    print '            <entry>%s</entry>' % ", ".join(sorted(old_pdict[p]))
-    print '            <entry>%s</entry>' % ", ".join(sorted(new_pdict[p]))
+    print '            <entry>%s</entry>' % old_p[0]
+    print '            <entry>%s</entry>' % new_p[0]
     print '          </row>'
 
 print '        </tbody>'
-- 
cgit v1.2.3-54-g00ecf