RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: yum                              Date:   13-Aug-2010 22:04:47
  Branch: HEAD                             Handle: 2010081320044700

  Modified files:
    yum/yum                 update_md.py

  Log:
    - include additional fields (#624079).

  Summary:
    Revision    Changes     Path
    1.2         +435 -128   yum/yum/update_md.py
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: yum/yum/update_md.py
  ============================================================================
  $ cvs diff -u -r1.1.1.19 -r1.2 update_md.py
  --- yum/yum/update_md.py	7 Aug 2010 15:21:33 -0000	1.1.1.19
  +++ yum/yum/update_md.py	13 Aug 2010 20:04:47 -0000	1.2
  @@ -56,6 +56,9 @@
               'issued'           : '',
               'updated'          : '',
               'description'      : '',
  +            'rights'           : '',
  +            'summary'          : '',
  +            'solution'         : '',
               'references'       : [],
               'pkglist'          : [],
               'reboot_suggested' : False
  @@ -103,11 +106,26 @@
                   cvelist += " %s\n\t    :" % cve['id']
               head += cvelist[: - 1].rstrip() + '\n'
   
  +        if self._md['summary'] is not None:
  +            desc = utf8_text_wrap(self._md['summary'], width=64,
  +                                  subsequent_indent=' ' * 12 + ': ')
  +            head += "    Summary : %s\n" % '\n'.join(desc)
  +
           if self._md['description'] is not None:
               desc = utf8_text_wrap(self._md['description'], width=64,
                                     subsequent_indent=' ' * 12 + ': ')
               head += "Description : %s\n" % '\n'.join(desc)
   
  +        if self._md['solution'] is not None:
  +            desc = utf8_text_wrap(self._md['solution'], width=64,
  +                                  subsequent_indent=' ' * 12 + ': ')
  +            head += "   Solution : %s\n" % '\n'.join(desc)
  +
  +        if self._md['rights'] is not None:
  +            desc = utf8_text_wrap(self._md['rights'], width=64,
  +                                  subsequent_indent=' ' * 12 + ': ')
  +            head += "     Rights : %s\n" % '\n'.join(desc)
  +
           #  Get a list of arches we care about:
           #XXX ARCH CHANGE - what happens here if we set the arch - we need to
           # pass this in, perhaps
  @@ -132,7 +150,7 @@
           Parse an update element::
   
               <!ELEMENT update (id, synopsis?, issued, updated,
  -                              references, description, pkglist)>
  +                              references, description, rights?, summary?, solution?, pkglist)>
                   <!ATTLIST update type (errata|security) "errata">
                   <!ATTLIST update status (final|testing) "final">
                   <!ATTLIST update version CDATA #REQUIRED>
  @@ -156,6 +174,12 @@
                       self._parse_references(child)
                   elif child.tag == 'description':
                       self._md['description'] = child.text
  +                elif child.tag == 'rights':
  +                    self._md['rights'] = child.text
  +                elif child.tag == 'summary':
  +                    self._md['summary'] = child.text
  +                elif child.tag == 'solution':
  +                    self._md['solution'] = child.text
                   elif child.tag == 'pkglist':
                       self._parse_pkglist(child)
                   elif child.tag == 'title':
  @@ -172,7 +196,7 @@
               <!ELEMENT references (reference*)>
               <!ELEMENT reference>
                   <!ATTLIST reference href CDATA #REQUIRED>
  -                <!ATTLIST reference type (self|cve|bugzilla) "self">
  +                <!ATTLIST reference type (self|other|cve|bugzilla) "self">
                   <!ATTLIST reference id CDATA #IMPLIED>
                   <!ATTLIST reference title CDATA #IMPLIED>
           """
  @@ -248,7 +272,13 @@
                   to_xml(self._md['title']), to_xml(self._md['release']),
                   to_xml(self._md['issued'], attrib=True),
                   to_xml(self._md['description']))
  -        
  +
  +        if self._md['summary']:
  +            msg += """  <summary>%s</summary>\n""" % (to_xml(self._md['summary']))
  +        if self._md['solution']:
  +            msg += """  <solution>%s</solution>\n""" % (to_xml(self._md['solution']))
  +        if self._md['rights']:
  +            msg += """  <rights>%s</rights>\n""" % (to_xml(self._md['rights']))        
           if self._md['references']:
               msg += """  <references>\n"""
               for ref in self._md['references']:
  @@ .