From 8291c16634489d517bbe995f3ca40d22d84b9795 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Tue, 4 Mar 2008 19:37:50 +0000 Subject: [PATCH] do not run databaseStructureUpdates() on a livecd system git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1403 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/databaseTools.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py index 7311ba4a2..ba177b126 100644 --- a/libraries/databaseTools.py +++ b/libraries/databaseTools.py @@ -156,7 +156,12 @@ class etpDatabase: self.doServerDatabaseSyncLock(self.noUpload) if os.access(self.dbFile,os.W_OK) and self.doesTableExist('baseinfo') and self.doesTableExist('extrainfo'): - self.databaseStructureUpdates() + if entropyTools.islive(): + # check where's the file + if etpConst['systemroot']: + self.databaseStructureUpdates() + else: + self.databaseStructureUpdates() def doServerDatabaseSyncLock(self, noUpload): @@ -3189,7 +3194,7 @@ class etpDatabase: if not self.doesTableExist("licensedata"): self.createLicensedataTable() - if not self.doesTableExist("licenses_accepted"): + if not self.doesTableExist("licenses_accepted") and (self.dbname == etpConst['clientdbid']): self.createLicensesAcceptedTable() if not self.doesColumnInTableExist("baseinfo","trigger"):