diff --git a/libraries/entropy/client/interfaces/dep.py b/libraries/entropy/client/interfaces/dep.py index 76db50963..200969525 100644 --- a/libraries/entropy/client/interfaces/dep.py +++ b/libraries/entropy/client/interfaces/dep.py @@ -210,7 +210,7 @@ class Calculators: def __atom_match_open_db(self, repoid, server_inst): if server_inst != None: - dbconn = server_inst.openServerDatabase(just_reading = True, repo = repoid) + dbconn = server_inst.open_server_repository(just_reading = True, repo = repoid) else: dbconn = self.Client.open_repository(repoid) return dbconn @@ -428,7 +428,7 @@ class Calculators: def __package_set_match_open_db(self, repoid, server_inst): if server_inst != None: - dbconn = server_inst.openServerDatabase(just_reading = True, repo = repoid) + dbconn = server_inst.open_server_repository(just_reading = True, repo = repoid) else: dbconn = self.Client.open_repository(repoid) return dbconn diff --git a/libraries/entropy/db.py b/libraries/entropy/db.py index a79e9635d..4eccd6c79 100644 --- a/libraries/entropy/db.py +++ b/libraries/entropy/db.py @@ -666,7 +666,7 @@ class LocalRepository: ) # lock database if self.lockRemote: - self.ServiceInterface.doServerDatabaseSyncLock(self.server_repo, self.noUpload) + self.ServiceInterface.do_server_repository_sync_lock(self.server_repo, self.noUpload) # now run queue try: self.runTreeUpdatesActions(update_actions) diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py index fc5c0e349..3251251d3 100644 --- a/libraries/entropy/server/interfaces/main.py +++ b/libraries/entropy/server/interfaces/main.py @@ -417,17 +417,17 @@ class Server(Singleton,TextInterface): except SystemDatabaseError: return False - dbc = self.openServerDatabase(just_reading = True, repo = repo) + dbc = self.open_server_repository(just_reading = True, repo = repo) valid = do_validate(dbc) self.close_server_database(dbc) if not valid: # check online? - dbc = self.openServerDatabase(read_only = False, no_upload = True, repo = repo, is_new = True) + dbc = self.open_server_repository(read_only = False, no_upload = True, repo = repo, is_new = True) valid = do_validate(dbc) self.close_server_database(dbc) return valid - def doServerDatabaseSyncLock(self, repo, no_upload): + def do_server_repository_sync_lock(self, repo, no_upload): if repo == None: repo = self.default_repository @@ -495,7 +495,7 @@ class Server(Singleton,TextInterface): self.MirrorsService.lock_mirrors(True, repo = repo) self.MirrorsService.sync_databases(no_upload, repo = repo) - def openServerDatabase( + def open_server_repository( self, read_only = True, no_upload = True, @@ -541,7 +541,7 @@ class Server(Singleton,TextInterface): os.makedirs(os.path.dirname(local_dbfile)) if (not read_only) and (lock_remote): - self.doServerDatabaseSyncLock(repo, no_upload) + self.do_server_repository_sync_lock(repo, no_upload) conn = self.LocalRepository( readOnly = read_only, @@ -620,7 +620,7 @@ class Server(Singleton,TextInterface): server_repos = etpConst['server_repositories'].keys() installed_packages = set() for repo in server_repos: - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) installed_packages |= set([(x,repo) for x in dbconn.listAllIdpackages()]) @@ -632,7 +632,7 @@ class Server(Singleton,TextInterface): count += 1 idpackage = pkgdata[0] repo = pkgdata[1] - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) atom = dbconn.retrieveAtom(idpackage) if atom == None: continue @@ -671,7 +671,7 @@ class Server(Singleton,TextInterface): crying_atoms = {} for atom in deps_not_matched: for repo in server_repos: - dbconn = self.openServerDatabase(just_reading = True, repo = repo) + dbconn = self.open_server_repository(just_reading = True, repo = repo) riddep = dbconn.searchDependency(atom) if riddep == -1: continue @@ -727,7 +727,7 @@ class Server(Singleton,TextInterface): def libraries_test(self, get_files = False, repo = None): # load db - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) packagesMatched, brokenexecs, status = self.ClientService.libraries_test(dbconn = dbconn, broken_symbols = False) if status != 0: return 1,None @@ -844,7 +844,7 @@ class Server(Singleton,TextInterface): return not_found def depends_table_initialize(self, repo = None): - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) dbconn.regenerateDependsTable() dbconn.taintDatabase() dbconn.commitChanges() @@ -898,7 +898,7 @@ class Server(Singleton,TextInterface): # sanity check invalid_atoms = [] - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) for idpackage in idpackages: ver_tag = dbconn.retrieveVersionTag(idpackage) if ver_tag: @@ -940,7 +940,7 @@ class Server(Singleton,TextInterface): return switched if not matches and from_repo: - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = from_repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = from_repo) matches = set( \ [(x,from_repo) for x in \ dbconn.listAllIdpackages()] @@ -972,7 +972,7 @@ class Server(Singleton,TextInterface): if new_tag != None: new_tag_string = "[%s: %s]" % (darkgreen(_("new tag")),brown(new_tag),) for match in matches: repo = match[1] - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) self.updateProgress( "[%s=>%s|%s] %s " % ( darkgreen(repo), @@ -992,7 +992,7 @@ class Server(Singleton,TextInterface): return switched for idpackage, repo in matches: - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) match_branch = dbconn.retrieveBranch(idpackage) match_atom = dbconn.retrieveAtom(idpackage) package_filename = os.path.basename(dbconn.retrieveDownloadURL(idpackage)) @@ -1081,7 +1081,7 @@ class Server(Singleton,TextInterface): if new_tag != None: data['versiontag'] = new_tag - todbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = to_repo) + todbconn = self.open_server_repository(read_only = False, no_upload = True, repo = to_repo) self.updateProgress( "[%s=>%s|%s] %s: %s" % ( @@ -1145,7 +1145,7 @@ class Server(Singleton,TextInterface): if not os.path.isdir(upload_dir): os.makedirs(upload_dir) - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) self.updateProgress( red("[repo: %s] %s: %s" % ( darkgreen(repo), @@ -1165,7 +1165,7 @@ class Server(Singleton,TextInterface): trashing_counters = set() myserver_repos = etpConst['server_repositories'].keys() for myrepo in myserver_repos: - mydbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = myrepo) + mydbconn = self.open_server_repository(read_only = True, no_upload = True, repo = myrepo) mylist = mydbconn.retrieve_packages_to_remove( mydata['name'], mydata['category'], @@ -1227,7 +1227,7 @@ class Server(Singleton,TextInterface): # this function changes the final repository package filename def _setup_repository_package_filename(self, idpackage, repo = None): - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) downloadurl = dbconn.retrieveDownloadURL(idpackage) packagerev = dbconn.retrieveRevision(idpackage) @@ -1293,7 +1293,7 @@ class Server(Singleton,TextInterface): # reinit depends table self.depends_table_initialize(repo) if idpackages_added: - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) missing_deps_taint = myQA.scan_missing_dependencies( idpackages_added, dbconn, @@ -1316,7 +1316,7 @@ class Server(Singleton,TextInterface): self.depends_table_initialize(repo) if idpackages_added: - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) missing_deps_taint = myQA.scan_missing_dependencies( idpackages_added, dbconn, @@ -1354,7 +1354,7 @@ class Server(Singleton,TextInterface): header = red(" @@ ") ) - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) for idpackage,package_path in injection_data: self.updateProgress( "[repo:%s|%s] %s: %s" % ( @@ -1432,7 +1432,7 @@ class Server(Singleton,TextInterface): if repo == None: repo = self.default_repository - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) for idpackage in idpackages: atom = dbconn.retrieveAtom(idpackage) self.updateProgress( @@ -1459,7 +1459,7 @@ class Server(Singleton,TextInterface): def bump_database(self, repo = None): - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) dbconn.taintDatabase() self.close_server_database(dbconn) @@ -1700,7 +1700,7 @@ class Server(Singleton,TextInterface): found = False for server_repo in server_repos: installed_counters.add(spm_counter) - server_dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = server_repo) + server_dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = server_repo) counter = server_dbconn.isCounterAvailable(spm_counter, branch = etpConst['branch']) if counter: found = True @@ -1711,7 +1711,7 @@ class Server(Singleton,TextInterface): # packages to be removed from the database database_counters = {} for server_repo in server_repos: - server_dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = server_repo) + server_dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = server_repo) database_counters[server_repo] = server_dbconn.listAllCounters(branch = etpConst['branch']) ordered_counters = set() @@ -1728,7 +1728,7 @@ class Server(Singleton,TextInterface): if counter in installed_counters: continue - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = xrepo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = xrepo) dorm = True # check if the package is in toBeAdded @@ -1779,13 +1779,13 @@ class Server(Singleton,TextInterface): def is_counter_trashed(self, counter): server_repos = etpConst['server_repositories'].keys() for repo in server_repos: - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) if dbconn.isCounterTrashed(counter): return True return False def transform_package_into_injected(self, idpackage, repo = None): - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) counter = dbconn.getNewNegativeCounter() dbconn.setCounter(idpackage,counter) dbconn.setInjected(idpackage) @@ -1810,7 +1810,7 @@ class Server(Singleton,TextInterface): if os.path.isfile(self.get_local_database_file(repo)): - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo, warnings = warnings) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo, warnings = warnings) if dbconn.doesTableExist("baseinfo") and dbconn.doesTableExist("extrainfo"): idpackages = dbconn.listAllIdpackages() @@ -1852,7 +1852,7 @@ class Server(Singleton,TextInterface): # initialize - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo, is_new = True) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo, is_new = True) dbconn.initializeDatabase() if not empty: @@ -1977,7 +1977,7 @@ class Server(Singleton,TextInterface): myQA = self.QA() if idpackages_added: - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) myQA.scan_missing_dependencies( idpackages_added, dbconn, ask = True, repo = repo, self_check = True, @@ -1992,7 +1992,7 @@ class Server(Singleton,TextInterface): def match_packages(self, packages, repo = None): - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) if ("world" in packages) or not packages: return dbconn.listAllIdpackages(),True else: @@ -2063,7 +2063,7 @@ class Server(Singleton,TextInterface): ) idpackages, world = self.match_packages(packages) - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) if world: self.updateProgress( @@ -2269,7 +2269,7 @@ class Server(Singleton,TextInterface): ) idpackages, world = self.match_packages(packages) - dbconn = self.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.open_server_repository(read_only = True, no_upload = True, repo = repo) if world: self.updateProgress( @@ -2560,7 +2560,7 @@ class Server(Singleton,TextInterface): type = "info", header = darkgreen(" @@ ") ) - dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo, lock_remote = False) + dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo, lock_remote = False) already_switched = set() not_found = set() @@ -2673,7 +2673,7 @@ class Server(Singleton,TextInterface): for setname in sets_data: good = True for atom in sets_data[setname]: - dbconn = self.openServerDatabase(just_reading = True, repo = repo) + dbconn = self.open_server_repository(just_reading = True, repo = repo) match = dbconn.atomMatch(atom) if match[0] == -1: good = False @@ -2688,7 +2688,22 @@ class Server(Singleton,TextInterface): if repo == None: repo = self.default_repository package_sets = self.get_configured_package_sets(repo) - if dbconn == None: dbconn = self.openServerDatabase(read_only = False, no_upload = True, repo = repo) + if dbconn == None: dbconn = self.open_server_repository(read_only = False, no_upload = True, repo = repo) dbconn.clearPackageSets() if package_sets: dbconn.insertPackageSets(package_sets) dbconn.commitChanges() + + + """ + XXX deprecated XXX + """ + + def openServerDatabase(self, *args, **kwargs): + import warning + warning.warn("deprecated, use open_server_repository instead") + return self.open_server_repository(*args, **kwargs) + + def doServerDatabaseSyncLock(self, *args, **kwargs): + import warning + warning.warn("deprecated, use do_server_repository_sync_lock instead") + return self.do_server_repository_sync_lock(*args, **kwargs) diff --git a/libraries/entropy/server/interfaces/mirrors.py b/libraries/entropy/server/interfaces/mirrors.py index 3899b4ca3..76e2bc314 100644 --- a/libraries/entropy/server/interfaces/mirrors.py +++ b/libraries/entropy/server/interfaces/mirrors.py @@ -449,7 +449,7 @@ class Server: ftp.close() return rc - dbconn = self.Entropy.openServerDatabase(read_only = True, no_upload = True, repo = repo) + dbconn = self.Entropy.open_server_repository(read_only = True, no_upload = True, repo = repo) idpackage = dbconn.getIDPackageFromDownload(pkg_relative_path) if idpackage == -1: self.Entropy.updateProgress( @@ -856,7 +856,7 @@ class Server: # f_out is a file instance def dump_database_to_file(self, db_path, destination_path, opener, repo = None): f_out = opener(destination_path, "wb") - dbconn = self.Entropy.openServerDatabase(db_path, just_reading = True, repo = repo) + dbconn = self.Entropy.open_server_repository(db_path, just_reading = True, repo = repo) dbconn.doDatabaseExport(f_out) self.Entropy.close_server_database(dbconn) f_out.close() @@ -1211,7 +1211,7 @@ class Server: return gave_up def shrink_database_and_close(self, repo = None): - dbconn = self.Entropy.openServerDatabase(read_only = False, no_upload = True, repo = repo, indexing = False) + dbconn = self.Entropy.open_server_repository(read_only = False, no_upload = True, repo = repo, indexing = False) dbconn.dropAllIndexes() dbconn.vacuum() dbconn.vacuum() @@ -1222,7 +1222,7 @@ class Server: if repo == None: repo = self.Entropy.default_repository - dbconn = self.Entropy.openServerDatabase(read_only = False, no_upload = True, repo = repo) + dbconn = self.Entropy.open_server_repository(read_only = False, no_upload = True, repo = repo) # grab treeupdates from other databases and inject server_repos = etpConst['server_repositories'].keys() all_actions = set() @@ -1232,7 +1232,7 @@ class Server: if myrepo == etpConst['clientserverrepoid']: continue - mydbc = self.Entropy.openServerDatabase(just_reading = True, repo = myrepo) + mydbc = self.Entropy.open_server_repository(just_reading = True, repo = myrepo) actions = mydbc.listAllTreeUpdatesActions(no_ids_repos = True) for data in actions: all_actions.add(data) @@ -2021,7 +2021,7 @@ class Server: # Collect packages that don't exist anymore in the database # so we can filter them out from the download queue - dbconn = self.Entropy.openServerDatabase(just_reading = True, repo = repo) + dbconn = self.Entropy.open_server_repository(just_reading = True, repo = repo) db_files = dbconn.listBranchPackagesTbz2(branch, do_sort = False, full_path = True) db_files = set([os.path.basename(x) for x in db_files if (self.Entropy.get_branch_from_download_relative_uri(x) == branch)]) @@ -2552,7 +2552,7 @@ class Server: def collect_expiring_packages(self, branch, repo = None): - dbconn = self.Entropy.openServerDatabase(just_reading = True, repo = repo) + dbconn = self.Entropy.open_server_repository(just_reading = True, repo = repo) database_bins = dbconn.listBranchPackagesTbz2(branch, do_sort = False, full_path = True) bins_dir = os.path.join(self.Entropy.get_local_packages_directory(repo),branch) repo_bins = set() diff --git a/libraries/entropy/services/system/commands.py b/libraries/entropy/services/system/commands.py index 85991f5a9..71c104549 100644 --- a/libraries/entropy/services/system/commands.py +++ b/libraries/entropy/services/system/commands.py @@ -1009,7 +1009,7 @@ class Repository(SocketCommands): if repoid not in self.HostInterface.Entropy.get_available_repositories(): return False,'repository id not available' - dbconn = self.HostInterface.Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = self.HostInterface.Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) idpackages = dbconn.listAllIdpackages(order_by = 'atom') package_data = [] package_data = { @@ -1031,7 +1031,7 @@ class Repository(SocketCommands): idpackage = myargs[0] repoid = myargs[1] - dbconn = self.HostInterface.Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = self.HostInterface.Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) package_data = dbconn.getPackageData(idpackage, trigger_unicode = True) dbconn.closeDB() return True,package_data @@ -1240,7 +1240,7 @@ class Repository(SocketCommands): 'data': {}, } - dbconn = self.HostInterface.Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = self.HostInterface.Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) if search_type == "atom": diff --git a/libraries/entropy/services/system/executors.py b/libraries/entropy/services/system/executors.py index 43f695c26..8d8939455 100644 --- a/libraries/entropy/services/system/executors.py +++ b/libraries/entropy/services/system/executors.py @@ -474,13 +474,13 @@ class Base: mydict['remove_data'] = {} for idpackage, repoid in to_remove: - dbconn = Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) mydict['remove_data'][(idpackage, repoid,)] = self._get_entropy_pkginfo(dbconn, idpackage, repoid) dbconn.closeDB() mydict['inject_data'] = {} for idpackage, repoid in to_inject: - dbconn = Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) mydict['inject_data'][(idpackage, repoid,)] = self._get_entropy_pkginfo(dbconn, idpackage, repoid) dbconn.closeDB() @@ -532,7 +532,7 @@ class Base: # run remove remdata = {} for idpackage,repoid in to_remove: - dbconn = Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) atoms_removed.append(dbconn.retrieveAtom(idpackage)) dbconn.closeDB() if not remdata.has_key(repoid): @@ -586,11 +586,11 @@ class Base: Entropy.dependencies_test() for idpackage, repoid in matches_added: - dbconn = Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) mydict['added_data'][(idpackage, repoid,)] = self._get_entropy_pkginfo(dbconn, idpackage, repoid) dbconn.closeDB() for idpackage, repoid in matches_injected: - dbconn = Entropy.openServerDatabase(repo = repoid, just_reading = True, warnings = False, do_cache = False) + dbconn = Entropy.open_server_repository(repo = repoid, just_reading = True, warnings = False, do_cache = False) mydict['inject_data'][(idpackage, repoid,)] = self._get_entropy_pkginfo(dbconn, idpackage, repoid) dbconn.closeDB() return True, mydict @@ -733,7 +733,7 @@ class Base: if mystdin: sys.stdin = os.fdopen(mystdin, 'rb') try: sys.stdout.write(_("Opening database to let it run treeupdates. If you won't see anything below, it's just fine.").encode('utf-8')+"\n") - dbconn = self.SystemManagerExecutor.SystemInterface.Entropy.openServerDatabase( + dbconn = self.SystemManagerExecutor.SystemInterface.Entropy.open_server_repository( repo = repoid, do_cache = False, read_only = True ) diff --git a/server/server_query.py b/server/server_query.py index 34f09b9c6..ca84417e9 100644 --- a/server/server_query.py +++ b/server/server_query.py @@ -37,7 +37,7 @@ def query(myopts): rc = 0 Entropy = Server() - dbconn = Entropy.openServerDatabase(just_reading = True) + dbconn = Entropy.open_server_repository(just_reading = True) if cmd == "search": diff --git a/server/server_reagent.py b/server/server_reagent.py index c51674299..0550f812b 100644 --- a/server/server_reagent.py +++ b/server/server_reagent.py @@ -151,7 +151,7 @@ def repositories(options): red(" %s " % (_("in"),) )+bold(repo)+red(" %s" % (_("repository"),) ) ) if not idpackages: return 2 - dbconn = Entropy.openServerDatabase(repo = repo, just_reading = True) + dbconn = Entropy.open_server_repository(repo = repo, just_reading = True) def dep_check_cb(s): return Entropy.entropyTools.isvalidatom(s) @@ -184,7 +184,7 @@ def repositories(options): print_info(brown(" @@ ")+blue("%s: %s" % (atom,_("no changes made"),) )) continue - w_dbconn = Entropy.openServerDatabase(repo = repo, read_only = False) + w_dbconn = Entropy.open_server_repository(repo = repo, read_only = False) atom_deps += [(x,etpConst['spm']['mdepend_id'],) for x in new_mdeps] deps_dict = {} for atom_dep, dep_id in atom_deps: @@ -266,7 +266,7 @@ def update(options): appdb = Entropy.SpmService.get_vdb_path() packages = [] - dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True) + dbconn = Entropy.open_server_repository(read_only = True, no_upload = True) for item in repackageItems: match = dbconn.atomMatch(item) @@ -297,7 +297,7 @@ def update(options): if toBeInjected: print_info(brown(" @@ ")+blue("%s:" % (_("These are the packages that would be changed to injected status"),) )) for idpackage,repoid in toBeInjected: - dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True, repo = repoid) + dbconn = Entropy.open_server_repository(read_only = True, no_upload = True, repo = repoid) atom = dbconn.retrieveAtom(idpackage) print_info(brown(" # ")+"["+blue(repoid)+"] "+red(atom)) if reagentRequestAsk: @@ -306,7 +306,7 @@ def update(options): rc = "Yes" if rc == "Yes": for idpackage,repoid in toBeInjected: - dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True, repo = repoid) + dbconn = Entropy.open_server_repository(read_only = True, no_upload = True, repo = repoid) atom = dbconn.retrieveAtom(idpackage) print_info(brown(" <> ")+blue("%s: " % (_("Transforming from database"),) )+red(atom)) Entropy.transform_package_into_injected(idpackage, repo = repoid) @@ -315,7 +315,7 @@ def update(options): if toBeRemoved: print_info(brown(" @@ ")+blue("%s:" % (_("These are the packages that would be removed from the database"),) )) for idpackage,repoid in toBeRemoved: - dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True, repo = repoid) + dbconn = Entropy.open_server_repository(read_only = True, no_upload = True, repo = repoid) atom = dbconn.retrieveAtom(idpackage) print_info(brown(" # ")+"["+blue(repoid)+"] "+red(atom)) if reagentRequestAsk: @@ -432,7 +432,7 @@ def database(options): to_branch = options[2] print_info(darkgreen(" * ")+red(_("Switching branch, be sure to have your packages in sync."))) print_info(darkgreen(" * ")+red("%s %s..." % (_("Collecting packages that would be marked"),to_branch,) ), back = True) - dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True) + dbconn = Entropy.open_server_repository(read_only = True, no_upload = True) pkglist = dbconn.listAllIdpackages(branch = from_branch) #myatoms = options[3:] @@ -463,7 +463,7 @@ def database(options): print_error(brown(" * ")+red(_("Not enough parameters"))) return 1 - dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True) + dbconn = Entropy.open_server_repository(read_only = True, no_upload = True) pkglist = set() for atom in myopts: pkg = dbconn.atomMatch(atom, multiMatch = True) @@ -500,7 +500,7 @@ def database(options): for opt in options[1:]: atoms.append(opt) - dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True) + dbconn = Entropy.open_server_repository(read_only = True, no_upload = True) idpackages = set() if not atoms: