diff --git a/libraries/entropy/db.py b/libraries/entropy/db.py index 4cd64564d..909a47a0e 100644 --- a/libraries/entropy/db.py +++ b/libraries/entropy/db.py @@ -1750,8 +1750,6 @@ class LocalRepository: self.commitChanges() def removeLicensedata(self, license_name): - if not self.doesTableExist("licensedata"): - return with self.__write_mutex: self.cursor.execute('DELETE FROM licensedata WHERE licensename = (?)', (license_name,)) @@ -3015,8 +3013,6 @@ class LocalRepository: def retrieveLicensedata(self, idpackage): # insert license information - if not self.doesTableExist("licensedata"): - return {} licenses = self.retrieveLicense(idpackage) if licenses == None: return {} @@ -3040,8 +3036,6 @@ class LocalRepository: def retrieveLicensedataKeys(self, idpackage): - if not self.doesTableExist("licensedata"): - return set() licenses = self.retrieveLicense(idpackage) if licenses == None: return set() @@ -3060,9 +3054,6 @@ class LocalRepository: def retrieveLicenseText(self, license_name): - if not self.doesTableExist("licensedata"): - return None - self.connection.text_factory = lambda x: unicode(x, "raw_unicode_escape") self.cursor.execute('SELECT text FROM licensedata WHERE licensename = (?)', (license_name,)) @@ -3265,8 +3256,6 @@ class LocalRepository: return False def isLicensedataKeyAvailable(self, license_name): - if not self.doesTableExist("licensedata"): - return True self.cursor.execute('SELECT licensename FROM licensedata WHERE licensename = (?)', (license_name,)) result = self.cursor.fetchone() if not result: @@ -3816,9 +3805,6 @@ class LocalRepository: old_readonly = self.readOnly self.readOnly = False - if not self.doesTableExist("licensedata"): - self.createLicensedataTable() - if not self.doesTableExist("licenses_accepted") and \ (self.dbname == etpConst['clientdbid']): self.createLicensesAcceptedTable() @@ -4373,8 +4359,6 @@ class LocalRepository: def createLicensedataIndex(self): if self.indexing: - if not self.doesTableExist("licensedata"): - return with self.__write_mutex: self.cursor.execute('CREATE INDEX IF NOT EXISTS licensedataindex ON licensedata ( licensename )')