From 2d348ef4bd34eed9e41d3f629b17df3d9c3361db Mon Sep 17 00:00:00 2001 From: lxnay Date: Sun, 22 Mar 2009 18:06:11 +0000 Subject: [PATCH] Entropy/Client/Interfaces: - fix typo occured when refactoring selfDbconn is self.clientDbconn git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@3215 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy/client/interfaces/dep.py | 1 - libraries/entropy/client/interfaces/methods.py | 6 +++--- libraries/entropy/client/interfaces/repository.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/entropy/client/interfaces/dep.py b/libraries/entropy/client/interfaces/dep.py index 77e2a53fc..c8920b9c8 100644 --- a/libraries/entropy/client/interfaces/dep.py +++ b/libraries/entropy/client/interfaces/dep.py @@ -497,7 +497,6 @@ class Calculators: open_repo = self.open_repository intf_error = self.dbapi2.InterfaceError cdb_getversioning = self.clientDbconn.getVersioningData - #cdb_retrieveneededraw = selfDbconn.retrieveNeededRaw etp_cmp = self.entropyTools.entropy_compare_versions etp_get_rev = self.entropyTools.dep_get_entropy_revision #do_needed_check = False diff --git a/libraries/entropy/client/interfaces/methods.py b/libraries/entropy/client/interfaces/methods.py index 4b9425bb4..11ab13750 100644 --- a/libraries/entropy/client/interfaces/methods.py +++ b/libraries/entropy/client/interfaces/methods.py @@ -400,7 +400,7 @@ class Repository: return 0,atoms_contained def reopen_client_repository(self): - selfDbconn.closeDB() + self.clientDbconn.closeDB() self.open_client_repository() def __client_repo_setup_const(self, conn): @@ -471,7 +471,7 @@ class Repository: importance = 2, type = "warning" ) - idpkgs = selfDbconn.listAllIdpackages() + idpkgs = self.clientDbconn.listAllIdpackages() length = len(idpkgs) count = 0 errors = False @@ -487,7 +487,7 @@ class Repository: percent = True ) try: - selfDbconn.getPackageData(x) + self.clientDbconn.getPackageData(x) except Exception ,e: self.entropyTools.print_traceback() errors = True diff --git a/libraries/entropy/client/interfaces/repository.py b/libraries/entropy/client/interfaces/repository.py index 21311d782..e51d30c01 100644 --- a/libraries/entropy/client/interfaces/repository.py +++ b/libraries/entropy/client/interfaces/repository.py @@ -251,7 +251,7 @@ class Repository: if os.path.isfile(repo_dbpath+"/"+etpConst['etpdatabaserevisionfile']): os.remove(repo_dbpath+"/"+etpConst['etpdatabaserevisionfile']) else: - mytxt = _("self.dbformat_eapi must be in (1,2)") + mytxt = _("self.dbformat_eapi must be in (1,2,3,)") raise InvalidData('InvalidData: %s' % (mytxt,)) def __unpack_downloaded_database(self, repo, cmethod):