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

[James Antill]

 yum/packages.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a0c7878bf900b812e1bea00e49014b0e90b81bd7
Merge: 523d7ed... 9ecde0a...
Author: James Antill <james at and.org>
Date:   Wed May 13 16:17:19 2009 -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 error opening repo files

commit 523d7ed151ada6d8a68caadb6089c618d98614bb
Author: James Antill <james at and.org>
Date:   Wed May 13 16:17:06 2009 -0400

    Default to the default checksum, not sha256, for local pkgs

diff --git a/yum/packages.py b/yum/packages.py
index 3dc7a15..48cee27 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1580,7 +1580,9 @@ class YumLocalPackage(YumHeaderPackage):
     def localPkg(self):
         return self.localpath
     
-    def _do_checksum(self, checksum_type='sha256'):
+    def _do_checksum(self, checksum_type=None):
+        if checksum_type is None:
+            checksum_type = misc._default_checksums[0]
         if not self._checksum:
             self._checksum = misc.checksum(checksum_type, self.localpath)
             self._checksums = [(checksum_type, self._checksum, 1)]