[yum-commits] Branch 'yum-3_2_X' - yum/packages.py

skvidal at osuosl.org skvidal at osuosl.org
Wed Jun 3 15:46:40 UTC 2009


 yum/packages.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3e0325de50a1b5194d04d82db61f1d4170e5c370
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Jun 3 11:44:26 2009 -0400

    apparently rpm can, occasionally make versions and releases which contain quotes.
    
    misc.to_xml them as attributes for the prcos.

diff --git a/yum/packages.py b/yum/packages.py
index a6c18c5..448d8a2 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -908,11 +908,11 @@ class YumAvailablePackage(PackageObject, RpmBase):
             if flags:
                 pcostring += ''' flags="%s"''' % flags
                 if e:
-                    pcostring += ''' epoch="%s"''' % e
+                    pcostring += ''' epoch="%s"''' % misc.to_xml(e, attrib=True)
                 if v:
-                    pcostring += ''' ver="%s"''' % v
+                    pcostring += ''' ver="%s"''' % misc.to_xml(v, attrib=True)
                 if r:
-                    pcostring += ''' rel="%s"''' % r
+                    pcostring += ''' rel="%s"''' % misc.to_xml(r, attrib=True)
                     
             pcostring += "/>\n"
             msg += pcostring
@@ -979,11 +979,11 @@ class YumAvailablePackage(PackageObject, RpmBase):
             if flags:
                 prcostring += ''' flags="%s"''' % flags
                 if e:
-                    prcostring += ''' epoch="%s"''' % e
+                    prcostring += ''' epoch="%s"''' % misc.to_xml(e, attrib=True)
                 if v:
-                    prcostring += ''' ver="%s"''' % v
+                    prcostring += ''' ver="%s"''' % misc.to_xml(v, attrib=True)
                 if r:
-                    prcostring += ''' rel="%s"''' % r
+                    prcostring += ''' rel="%s"''' % misc.to_xml(r, attrib=True)
             if pre:
                 prcostring += ''' pre="%s"''' % pre
                     


More information about the Yum-commits mailing list