Entropy/EquoInterface:
- openRepositoryDatabase: avoid crashing on configprotect table if db is corrupted git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1835 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
@@ -416,8 +416,15 @@ class EquoInterface(TextInterface):
|
||||
if (etpRepositories[repositoryName]['configprotect'] == None) or \
|
||||
(etpRepositories[repositoryName]['configprotectmask'] == None):
|
||||
|
||||
etpRepositories[repositoryName]['configprotect'] = conn.listConfigProtectDirectories()
|
||||
etpRepositories[repositoryName]['configprotectmask'] = conn.listConfigProtectDirectories(mask = True)
|
||||
try:
|
||||
etpRepositories[repositoryName]['configprotect'] = conn.listConfigProtectDirectories()
|
||||
except self.databaseTools.dbapi2.OperationalError:
|
||||
etpRepositories[repositoryName]['configprotect'] = []
|
||||
try:
|
||||
etpRepositories[repositoryName]['configprotectmask'] = conn.listConfigProtectDirectories(mask = True)
|
||||
except self.databaseTools.dbapi2.OperationalError:
|
||||
etpRepositories[repositoryName]['configprotectmask'] = []
|
||||
|
||||
etpRepositories[repositoryName]['configprotect'] = [etpConst['systemroot']+x for x in etpRepositories[repositoryName]['configprotect']]
|
||||
etpRepositories[repositoryName]['configprotectmask'] = [etpConst['systemroot']+x for x in etpRepositories[repositoryName]['configprotectmask']]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user