diff options
author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-11 07:54:25 +0200 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-11 00:47:22 -0700 |
commit | f2a5c4b7fc9f899de140ff6faa7e538fdccff677 (patch) | |
tree | a6144b571c006765474fd6d63924c7637545fb58 | |
parent | d4b290462810b859d780e83921d187d43e20b443 (diff) | |
download | portage-f2a5c4b7fc9f899de140ff6faa7e538fdccff677.tar.gz portage-f2a5c4b7fc9f899de140ff6faa7e538fdccff677.tar.bz2 portage-f2a5c4b7fc9f899de140ff6faa7e538fdccff677.zip |
Remove deprecated portage.digestParseFile
-rw-r--r-- | pym/portage/__init__.py | 2 | ||||
-rw-r--r-- | pym/portage/_deprecated.py | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e7cec02cf..f9c9eb718 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -132,7 +132,7 @@ try: 'suffix_value@endversion,pkgcmp,pkgsplit,vercmp,ververify', 'portage.xpak', 'portage._deprecated:dep_virtual,' + \ - 'digestParseFile,getvirtuals,pkgmerge', + 'getvirtuals,pkgmerge', ) import portage.const diff --git a/pym/portage/_deprecated.py b/pym/portage/_deprecated.py index 7b9abec4e..ea40c2dde 100644 --- a/pym/portage/_deprecated.py +++ b/pym/portage/_deprecated.py @@ -15,26 +15,6 @@ from portage.localization import _ from portage.manifest import Manifest from portage.util import writemsg, writemsg_stdout -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 - and returns a dict with the filenames as keys and {checksumkey:checksum} - as the values. - DEPRECATED: this function is now only a compability wrapper for - portage.manifest.Manifest().""" - - warnings.warn("portage.digestParseFile() is deprecated", - DeprecationWarning, stacklevel=2) - - mysplit = myfilename.split(os.sep) - if mysplit[-2] == "files" and mysplit[-1].startswith("digest-"): - pkgdir = os.sep + os.sep.join(mysplit[:-2]).strip(os.sep) - elif mysplit[-1] == "Manifest": - pkgdir = os.sep + os.sep.join(mysplit[:-1]).strip(os.sep) - - return Manifest(pkgdir, None).getDigests() - def dep_virtual(mysplit, mysettings): "Does virtual dependency conversion" warnings.warn("portage.dep_virtual() is deprecated", |