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

[skvidal at osuosl.org]

 etc/yum.bash    |    2 +-
 yum/packages.py |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 089c9b097bfaa83eb7e6113476fd1ccab1589794
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Jun 7 10:34:02 2010 -0400

    add 'localupdate' as a completeable command

diff --git a/etc/yum.bash b/etc/yum.bash
index 0fcba24..3e6e243 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -81,7 +81,7 @@ _yum()
     local prev=$3
     local cmds=( check check-update clean deplist downgrade groupinfo
         groupinstall grouplist groupremove help history info install list
-        localinstall makecache provides reinstall remove repolist resolvedep
+        localinstall localupdate makecache provides reinstall remove repolist resolvedep
         search shell update upgrade version distro-sync )
 
     local i c cmd
commit 562d31c2aa6590f9d132720fe7299f98df32b915
Merge: 8359e3b... 560dd59...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Jun 7 10:33:03 2010 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Catch+rethrow ValueError as well as KeyError, accessing rpm hdr attribs.
      Always try searchNames() in rpm, because .dbMatch('name') is so damn fast.
      Speedup large list output, like "yum list installed"

commit 8359e3b259bc792accd59189e67a7d3335dcc9b2
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Jun 4 11:01:33 2010 -0400

    make sure we add our '\n's in the right place to keep the xml output 'pretty'
    
    closes rh bug:  https://bugzilla.redhat.com/show_bug.cgi?id=600201

diff --git a/yum/packages.py b/yum/packages.py
index 4687cd3..aedabe6 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1039,7 +1039,10 @@ class YumAvailablePackage(PackageObject, RpmBase):
         msg += self._dump_pco('conflicts')         
         msg += self._dump_pco('obsoletes')         
         msg += self._dump_files(True)
-        msg += """\n  </format>"""
+        if msg[-1] != '\n':
+            msg += """\n"""
+        msg += """  </format>"""
+        
         return msg
 
     def _dump_pco(self, pcotype):
@@ -1065,7 +1068,7 @@ class YumAvailablePackage(PackageObject, RpmBase):
         return msg
     
     def _dump_files(self, primary=False):
-        msg =""
+        msg ="\n"
         if not primary:
             files = self.returnFileEntries('file')
             dirs = self.returnFileEntries('dir')