Use description from d/control in RFS template

debexpo/controllers/sponsor.py

@@ -103,6 +103,18 @@ class SponsorController(BaseController):
                 return False
         return True
 
+    def _get_package_description(self, package_version):
+        control = meta.session.query(PackageInfo) \
+            .filter_by(package_version_id=package_version.id) \
+            .filter_by(from_plugin='controlfields') \
+            .first()
+
+        if control:
+            info = json.loads(control.data)
+
+            if info:
+                return info.get('Short-Description')
+
     def _get_package_rfs_info(self, package_version):
         info = None
 
@@ -290,6 +302,7 @@ class SponsorController(BaseController):
         c.rfstemplate = None
         c.category = None
         c.severity = None
+        c.description = None
 
         if packagename:
             package = meta.session.query(Package) \
@@ -309,6 +322,7 @@ class SponsorController(BaseController):
                     c.rfstemplate = self._get_package_rfs_info(latest)
                     (c.category, c.severity) = \
                         self._get_package_extra_info(latest)
+                    c.description = self._get_package_description(latest)
 
         # This is a workaround for Thunderbird and some other clients
         # not handling properly '+' in the mailto body parameter.

debexpo/plugins/controlfields.py

@@ -90,13 +90,18 @@ class ControlFieldsPlugin(BasePlugin):
         descriptions = []
         for package in deb822.Dsc.iter_paragraphs(
                 file(join('extracted', 'debian', 'control'))):
-            if ('Description' in package and 'Package' in package and
-                    package['Package'] and package['Description']):
+            if all(package.get(i) for i in ('Package', 'Description')):
+                if package['Package'] == control.get('Source'):
+                    data['Short-Description'] = \
+                            package['Description'].split('\n')[0]
                 descriptions.append('{} - {}'.format(package['Package'],
                                     package['Description'].split('\n')[0]))
 
         data['Description'] = '\n'.join(descriptions)
 
+        if 'Short-Description' not in data and descriptions:
+            data['Short-Description'] = descriptions[0].split(' - ')[1]
+
         self.failed(outcome, data, severity)
 
 

debexpo/templates/sponsor/rfs_howto.mako

@@ -40,9 +40,9 @@ list. You can browser other packages and give other people feedback while you ar
 <p>
 %if c.package:
 %if c.category:
-<a href="mailto:submit@bugs.debian.org?subject=RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } ${ c.category } -- ${ c.package.short_description() }&body=${ c.mailbody }">
+<a href="mailto:submit@bugs.debian.org?subject=RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } ${ c.category } -- ${ c.description }&body=${ c.mailbody }">
 %else:
-<a href="mailto:submit@bugs.debian.org?subject=RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } -- ${ c.package.short_description() }&body=${ c.mailbody }">
+<a href="mailto:submit@bugs.debian.org?subject=RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } -- ${ c.description }&body=${ c.mailbody }">
 %endif
 %else:
 <a href="mailto:submit@bugs.debian.org?subject=RFS: hello/3.1-4 [put in ITP, ITA, RC, NMU if applicable] -- friendly greeter&body=${ c.mailbody }">
@@ -63,9 +63,9 @@ From: J. Maintainer &lt;j@example.com&gt;
 To: submit@bugs.debian.org
 %if c.package:
 %if c.category:
-Subject: RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } ${ c.category } -- ${ c.package.short_description() }
+Subject: RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } ${ c.category } -- ${ c.description }
 %else:
-Subject: RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } -- ${ c.package.short_description() }
+Subject: RFS: ${ c.package.name }/${ c.package.package_versions[-1].version } -- ${ c.description }
 %endif
 %else:
 Subject: RFS: hello/3.1-4 [put in ITP, ITA, RC, NMU if applicable] -- friendly greeter