From 6956cfdffccff7c0c456a15dd77c6896bcf236bc Mon Sep 17 00:00:00 2001 From: lxnay Date: Sun, 15 Mar 2009 13:04:28 +0000 Subject: [PATCH] Entropy/*: - use extract_xpak instead of extractXpak function (deprecated) - use read_xpak instead of read_xpak function (deprecated) - use compare_md5 instead of compareMd5 function (deprecated) - use sort_update_files instead of sortUpdateFiles function (deprecated) - use allocate_masked_file instead of allocateMaskedFile function (deprecated) - use extract_elog instead of extractElog function (deprecated) - use remove_package_operators instead of removePackageOperators (deprecated) git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@3185 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy/client/interfaces/fetch.py | 2 +- libraries/entropy/client/interfaces/metadata.py | 2 +- libraries/entropy/client/interfaces/package.py | 2 +- libraries/entropy/client/interfaces/repository.py | 2 +- libraries/entropy/db.py | 4 ++-- libraries/entropy/security.py | 2 +- libraries/entropy/server/interfaces/main.py | 2 +- libraries/entropy/server/interfaces/mirrors.py | 2 +- libraries/entropy/tools.py | 2 +- libraries/entropy/transceivers.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/entropy/client/interfaces/fetch.py b/libraries/entropy/client/interfaces/fetch.py index ec8cd7353..260db2a46 100644 --- a/libraries/entropy/client/interfaces/fetch.py +++ b/libraries/entropy/client/interfaces/fetch.py @@ -47,7 +47,7 @@ class Fetchers: return 0 else: # check digest - md5res = self.entropyTools.compareMd5(etpConst['entropyworkdir']+"/"+filepath,checksum) + md5res = self.entropyTools.compare_md5(etpConst['entropyworkdir']+"/"+filepath,checksum) if (md5res): return 0 else: diff --git a/libraries/entropy/client/interfaces/metadata.py b/libraries/entropy/client/interfaces/metadata.py index d75009c17..dd811719b 100644 --- a/libraries/entropy/client/interfaces/metadata.py +++ b/libraries/entropy/client/interfaces/metadata.py @@ -227,7 +227,7 @@ class Extractors: for item in foundfiles: mtimes.append((self.entropyTools.getFileUnixMtime(os.path.join(log_dir,item)),item)) mtimes = sorted(mtimes) elogfile = mtimes[-1][1] - messages = self.entropyTools.extractElog(os.path.join(log_dir,elogfile)) + messages = self.entropyTools.extract_elog(os.path.join(log_dir,elogfile)) for message in messages: message = message.replace("emerge","install") pkg_messages.append(message) diff --git a/libraries/entropy/client/interfaces/package.py b/libraries/entropy/client/interfaces/package.py index a914b37eb..fcaf780e6 100644 --- a/libraries/entropy/client/interfaces/package.py +++ b/libraries/entropy/client/interfaces/package.py @@ -1183,7 +1183,7 @@ class Package: if tofile not in etpConst['configprotectskip']: prot_status = True if do_allocation_check: - tofile, prot_status = self.entropyTools.allocateMaskedFile(tofile, fromfile) + tofile, prot_status = self.entropyTools.allocate_masked_file(tofile, fromfile) if not prot_status: protected = False else: diff --git a/libraries/entropy/client/interfaces/repository.py b/libraries/entropy/client/interfaces/repository.py index f7a882b05..2c941af28 100644 --- a/libraries/entropy/client/interfaces/repository.py +++ b/libraries/entropy/client/interfaces/repository.py @@ -311,7 +311,7 @@ class Repository: mytxt = _("self.dbformat_eapi must be in (1,2)") raise InvalidData('InvalidData: %s' % (mytxt,)) - rc = self.entropyTools.compareMd5(etpRepositories[repo]['dbpath']+"/"+dbfile,md5hash) + rc = self.entropyTools.compare_md5(etpRepositories[repo]['dbpath']+"/"+dbfile,md5hash) return rc # @returns -1 if the file is not available diff --git a/libraries/entropy/db.py b/libraries/entropy/db.py index 6f2f95b68..598f173f4 100644 --- a/libraries/entropy/db.py +++ b/libraries/entropy/db.py @@ -630,7 +630,7 @@ class LocalRepository: spm = self.ServiceInterface.SpmService updates_dir = etpConst['systemroot']+spm.get_spm_setting("PORTDIR")+"/profiles/updates" - update_files = self.entropyTools.sortUpdateFiles(os.listdir(updates_dir)) + update_files = self.entropyTools.sort_update_files(os.listdir(updates_dir)) update_files = [os.path.join(updates_dir,x) for x in update_files] # now load actions from files update_actions = [] @@ -2822,7 +2822,7 @@ class LocalRepository: # You must provide the full atom to this function # WARNING: this function does not support branches def isPackageAvailable(self, pkgatom): - pkgatom = self.entropyTools.removePackageOperators(pkgatom) + pkgatom = self.entropyTools.remove_package_operators(pkgatom) self.cursor.execute('SELECT idpackage FROM baseinfo WHERE atom = (?)', (pkgatom,)) result = self.cursor.fetchone() if result: return result[0] diff --git a/libraries/entropy/security.py b/libraries/entropy/security.py index 080d04d09..7a8c4ba2e 100644 --- a/libraries/entropy/security.py +++ b/libraries/entropy/security.py @@ -154,7 +154,7 @@ class SecurityInterface: self.advisories_changed = False else: self.advisories_changed = True - md5res = self.entropyTools.compareMd5(self.download_package,checksum) + md5res = self.entropyTools.compare_md5(self.download_package,checksum) if not md5res: return 3 return 0 diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py index 4a01bbe1b..9273561f5 100644 --- a/libraries/entropy/server/interfaces/main.py +++ b/libraries/entropy/server/interfaces/main.py @@ -2427,7 +2427,7 @@ class Server(Singleton,TextInterface): storedmd5 = dbconn.retrieveDigest(idpackage) pkgpath = os.path.join(self.get_local_packages_directory(repo),orig_branch,pkgfile) - result = self.entropyTools.compareMd5(pkgpath,storedmd5) + result = self.entropyTools.compare_md5(pkgpath,storedmd5) if result: fine.add(idpackage) else: diff --git a/libraries/entropy/server/interfaces/mirrors.py b/libraries/entropy/server/interfaces/mirrors.py index a1f3661aa..c44c4ca99 100644 --- a/libraries/entropy/server/interfaces/mirrors.py +++ b/libraries/entropy/server/interfaces/mirrors.py @@ -484,7 +484,7 @@ class Server: ) pkg_path = os.path.join(download_path,pkgfile) - md5check = self.entropyTools.compareMd5(pkg_path,storedmd5) + md5check = self.entropyTools.compare_md5(pkg_path,storedmd5) if md5check: self.Entropy.updateProgress( "[repo:%s|%s|#%s] %s: %s %s" % ( diff --git a/libraries/entropy/tools.py b/libraries/entropy/tools.py index bf848e2fb..3cadec990 100644 --- a/libraries/entropy/tools.py +++ b/libraries/entropy/tools.py @@ -2612,7 +2612,7 @@ def extractElog(*args, **kwargs): def removePackageOperators(*args, **kwargs): import warnings - warnings.warn("deprecated, use remove_pacakge_operators instead") + warnings.warn("deprecated, use remove_package_operators instead") return remove_package_operators(*args, **kwargs) def compareVersions(*args, **kwargs): diff --git a/libraries/entropy/transceivers.py b/libraries/entropy/transceivers.py index 72880b867..8b1c0693b 100644 --- a/libraries/entropy/transceivers.py +++ b/libraries/entropy/transceivers.py @@ -1102,7 +1102,7 @@ class FtpServerHandler: return False elif len(checksum) == 32: # valid? checking - ckres = self.entropyTools.compareMd5(local_filepath,checksum) + ckres = self.entropyTools.compare_md5(local_filepath,checksum) if ckres: self.Entropy.updateProgress( "[%s|#%s|(%s/%s)] %s: %s: %s" % (