From 6bbb6048542eb09a7ace1e7c1984fc95399eedc3 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Sat, 8 Mar 2008 17:06:24 +0000 Subject: [PATCH] - create content index only on non-repo databases - check if /var/db/pkg exists git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1429 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/databaseTools.py | 3 ++- libraries/entropy.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py index 44d09fc48..e6fc3eb69 100644 --- a/libraries/databaseTools.py +++ b/libraries/databaseTools.py @@ -3473,7 +3473,8 @@ class etpDatabase: self.cursor.execute('CREATE TABLE packed_data ( idpack INTEGER PRIMARY KEY, data BLOB );') def createAllIndexes(self): - self.createContentIndex() + if not self.dbname.startswith(etpConst['dbnamerepoprefix']): + self.createContentIndex() self.createBaseinfoIndex() self.createKeywordsIndex() self.createDependenciesIndex() diff --git a/libraries/entropy.py b/libraries/entropy.py index 8fb92bef1..8be1a8225 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -2698,13 +2698,14 @@ class PackageInterface: # handle gentoo-compat _portage_avail = False + portDbDir = '' try: import portageTools + portDbDir = portageTools.getPortageAppDbPath() _portage_avail = True except: return -1 # no Portage support - if (_portage_avail): - portDbDir = portageTools.getPortageAppDbPath() + if _portage_avail and os.path.isdir(portDbDir): # extract xpak from unpackDir+etpConst['packagecontentdir']+"/"+package key = self.infoDict['category']+"/"+self.infoDict['name'] atomsfound = set()