Entropy/ServerInterface:
- run treeupdates server-side for every opened repository git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1772 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
@@ -265,7 +265,7 @@ class etpDatabase:
|
||||
# check for /usr/portage/profiles/updates changes
|
||||
def serverUpdatePackagesData(self):
|
||||
|
||||
etpConst['treeupdatescalled'] = True
|
||||
etpConst['server_treeupdatescalled'].add(self.server_repo)
|
||||
|
||||
repo_updates_file = self.ServiceInterface.get_local_database_treeupdates_file(self.server_repo)
|
||||
doRescan = False
|
||||
|
||||
@@ -1435,7 +1435,10 @@ class EquoInterface(TextInterface):
|
||||
repo_pkgrev = 9999
|
||||
|
||||
if (deep_deps):
|
||||
vcmp = self.entropyTools.entropyCompareVersions((repo_pkgver,repo_pkgtag,repo_pkgrev),(installedVer,installedTag,installedRev))
|
||||
vcmp = self.entropyTools.entropyCompareVersions(
|
||||
(repo_pkgver,repo_pkgtag,repo_pkgrev),
|
||||
(installedVer,installedTag,installedRev)
|
||||
)
|
||||
if vcmp != 0:
|
||||
depunsatisfied.add(dependency)
|
||||
else:
|
||||
@@ -1457,8 +1460,8 @@ class EquoInterface(TextInterface):
|
||||
depsatisfied.clear()
|
||||
'''
|
||||
|
||||
unsatisfiedDeps.update(depunsatisfied)
|
||||
satisfiedDeps.update(depsatisfied)
|
||||
unsatisfiedDeps |= depunsatisfied
|
||||
satisfiedDeps |= depsatisfied
|
||||
|
||||
if self.xcache:
|
||||
try:
|
||||
@@ -11373,7 +11376,7 @@ class ServerInterface(TextInterface):
|
||||
|
||||
# verify if we need to update the database to sync
|
||||
# with portage updates, we just ignore being readonly in the case
|
||||
if not etpConst['treeupdatescalled'] and not just_reading:
|
||||
if (repo not in etpConst['server_treeupdatescalled']) and (not just_reading):
|
||||
# sometimes, when filling a new server db, we need to avoid tree updates
|
||||
if valid:
|
||||
conn.serverUpdatePackagesData()
|
||||
|
||||
@@ -632,6 +632,7 @@ def const_defaultSettings(rootdir):
|
||||
'defaultumask': 022,
|
||||
'storeumask': 002,
|
||||
'treeupdatescalled': False, # to avoid running tree updates functions multiple times
|
||||
'server_treeupdatescalled': set(),
|
||||
'spm': {
|
||||
'exec': "/usr/bin/emerge", # source package manager executable
|
||||
'ask_cmd': "--ask",
|
||||
|
||||
Reference in New Issue
Block a user