Remove the "db" parameter from digestParseFile() because it's not needed.
authorZac Medico <zmedico@gentoo.org>
Tue, 11 Apr 2006 02:57:41 +0000 (02:57 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 11 Apr 2006 02:57:41 +0000 (02:57 -0000)
svn path=/main/trunk/; revision=3122

pym/portage.py

index 8b661346748f3d87ea2d40a82d9101146a64512c..7bcfacfa09fc7f9cc99f38d8637e563786f6cb6d 100644 (file)
@@ -2089,7 +2089,7 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0):
        
        return 1
 
-def digestParseFile(myfilename,mysettings=None,db=None):
+def digestParseFile(myfilename, mysettings=None):
        """(filename) -- Parses a given file for entries matching:
        <checksumkey> <checksum_hex_string> <filename> <filesize>
        Ignores lines that don't start with a valid checksum identifier
@@ -2104,9 +2104,8 @@ def digestParseFile(myfilename,mysettings=None,db=None):
        elif mysplit[-1] == "Manifest":
                pkgdir = os.sep + os.sep.join(mysplit[:-1]).strip(os.sep)
 
-       if db is None:
-               db = portagetree().dbapi
        if mysettings is None:
+               global settings
                mysettings = config(clone=settings)
 
        mf = Manifest(pkgdir, FetchlistDict(pkgdir, mysettings), mysettings["DISTDIR"])