From cb5f2a8bbb0eb2a5c84691e2e93b224cbdf034b5 Mon Sep 17 00:00:00 2001 From: lxnay Date: Mon, 5 Jan 2009 21:22:33 +0000 Subject: [PATCH] Entropy/EntropyDatabaseInterface: - addPackageToInstalledTable(): code style update - insertPackageSets(): do not use an iter function git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2849 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/libraries/entropy.py b/libraries/entropy.py index f7fb1badc..2e2605457 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -31708,7 +31708,7 @@ class EntropyDatabaseInterface: mytable = 'configprotect' if mask: mytable += 'mask' with self.WriteLock: - self.cursor.execute('INSERT into '+mytable+' VALUES (?,?)', (idpackage,idprotect,)) + self.cursor.execute('INSERT into %s VALUES (?,?)' % (mytable,), (idpackage,idprotect,)) def insertMirrors(self, mirrors): @@ -32336,13 +32336,13 @@ class EntropyDatabaseInterface: def insertPackageSets(self, sets_data): self.checkReadOnly() - def myiter(): - for setname in sorted(sets_data.keys()): - for dependency in sorted(list(sets_data[setname])): - yield (setname,dependency,) + mysets = [] + for setname in sorted(sets_data.keys()): + for dependency in sorted(list(sets_data[setname])): + mysets.append((setname,dependency,)) with self.WriteLock: - self.cursor.executemany('INSERT into packagesets VALUES (?,?)', myiter()) + self.cursor.executemany('INSERT INTO packagesets VALUES (?,?)', mysets) def retrievePackageSets(self): self.cursor.execute('SELECT setname,dependency FROM packagesets') @@ -33651,13 +33651,7 @@ class EntropyDatabaseInterface: def addPackageToInstalledTable(self, idpackage, repositoryName): self.checkReadOnly() with self.WriteLock: - self.cursor.execute( - 'INSERT into installedtable VALUES ' - '(?,?)' - , ( idpackage, - repositoryName, - ) - ) + self.cursor.execute('INSERT into installedtable VALUES (?,?)', (idpackage, repositoryName,)) self.commitChanges() def retrievePackageFromInstalledTable(self, idpackage):