[Rpm-metadata] createrepo/__init__.py createrepo/yumbased.py genpkgmetadata.py

skvidal at osuosl.org skvidal at osuosl.org
Mon Jan 26 15:30:48 UTC 2009


 createrepo/__init__.py |    2 +-
 createrepo/yumbased.py |    4 +++-
 genpkgmetadata.py      |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 3b43f1280d94776689816cf96c6cc8135726b240
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Jan 26 10:30:05 2009 -0500

    make sha256 the default checksum type everywhere

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index 960dc80..b3a91cc 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@ -56,7 +56,7 @@ class MetaDataConfig(object):
         self.excludes = []
         self.baseurl = None
         self.groupfile = None
-        self.sumtype = 'sha'
+        self.sumtype = 'sha256'
         self.pretty = False
         self.cachedir = None 
         self.use_cache = False
diff --git a/createrepo/yumbased.py b/createrepo/yumbased.py
index 2e23f9d..b820fd8 100644
--- a/createrepo/yumbased.py
+++ b/createrepo/yumbased.py
@@ -48,6 +48,7 @@ class CreateRepoPackage(YumLocalPackage):
         # not using the cachedir
         if not self._cachedir:
             self._checksum = misc.checksum(self.checksum_type, self.localpath)
+            self._checksums = [(self.checksum_type, self._checksum, 1)]            
             return self._checksum
 
 
@@ -73,7 +74,7 @@ class CreateRepoPackage(YumLocalPackage):
             csumo.close()
              
         else:
-            checksum = misc.checksum('sha', self.localpath)
+            checksum = misc.checksum(self.checksum_type, self.localpath)
 
             #  This is atomic cache creation via. rename, so we can have two
             # tasks using the same cachedir ... mash does this.
@@ -87,6 +88,7 @@ class CreateRepoPackage(YumLocalPackage):
                 pass
         
         self._checksum = checksum
+        self._checksums = [(self.checksum_type, checksum, 1)]
 
         return self._checksum
     
diff --git a/genpkgmetadata.py b/genpkgmetadata.py
index ca77a3a..ec69cb8 100755
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
@@ -51,7 +51,7 @@ def parseArgs(args, conf):
                       help="baseurl to append on all files")
     parser.add_option("-g", "--groupfile", default=None,
                       help="path to groupfile to include in metadata")
-    parser.add_option("-s", "--checksum", default="sha", dest='sumtype',
+    parser.add_option("-s", "--checksum", default="sha256", dest='sumtype',
                       help="Deprecated, ignore")
     parser.add_option("-p", "--pretty", default=False, action="store_true",
                       help="make sure all xml generated is formatted")


More information about the Rpm-metadata mailing list