[Rpm-metadata] createrepo/yumbased.py

Seth Vidal skvidal at linux.duke.edu
Tue Jan 8 15:45:40 UTC 2008


 createrepo/yumbased.py |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit eb723baaf74822f3b3693b4971a8d8035a7278f1
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jan 8 10:44:01 2008 -0500

    make sure that we check for  nonexistent items in the hdr

diff --git a/createrepo/yumbased.py b/createrepo/yumbased.py
index e371eb1..7113498 100644
--- a/createrepo/yumbased.py
+++ b/createrepo/yumbased.py
@@ -37,6 +37,8 @@ class CreateRepoPackage(YumLocalPackage):
         self._hdrend = None
         
     def _xml(self, item):
+        print item
+        print type(item)
         return xml.sax.saxutils.escape(item)
         
     def _do_checksum(self):
@@ -117,15 +119,20 @@ class CreateRepoPackage(YumLocalPackage):
   <checksum type="sha" pkgid="YES">%s</checksum>
   <summary>%s</summary>
   <description>%s</description>
-  <packager>%s</packager>
-  <url>%s</url>
   <time file="%s" build="%s"/>
   <size package="%s" installed="%s" archive="%s"/>
 
   """ % (self.name, self.arch, self.epoch, self.ver, self.rel, self.checksum, 
          self._xml(self.summary), self._xml(self.description), 
-         self._xml(self.packager), self._xml(self.url), self.filetime,
-         self.buildtime, self.packagesize, self.size, self.archivesize)
+         self.filetime, self.buildtime, self.packagesize, self.size, 
+         self.archivesize)
+         
+        if self.packager:
+            msg += """  <packager>%s</packager>""" % (self._xml(self.packager))
+        
+        if self.url:
+            msg += """  <url>%s</url>""" % (self._xml(self.url))
+
         if baseurl:
             msg += """<location xml:base="%s" href="%s"/>\n""" % (self._xml(baseurl), relpath)
         else:



More information about the Rpm-metadata mailing list