* [gentoo-commits] packages:master commit in: dbgenerator/
@ 2011-07-08 1:52 Robin H. Johnson
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson @ 2011-07-08 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 5a95efa1da01fecb1516a94263cacc3744e7dab4
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 8 01:42:29 2011 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 01:42:46 2011 +0000
URL: http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=5a95efa1
Improve version detection code.
---
dbgenerator/database.py | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/dbgenerator/database.py b/dbgenerator/database.py
index 94ae0e2..6698d90 100644
--- a/dbgenerator/database.py
+++ b/dbgenerator/database.py
@@ -549,20 +549,23 @@ class SQLPackageDatabase(object):
def schema_is_current(self):
"""Check if the database schema version matches the
version expected by the sourcecode"""
+ result = False
+ detected_version = None
try:
sql = self.sql['SELECT_schema_is_current']
self.cursor.execute(sql)
entries = self.cursor.fetchall()
- if entries is None:
- return False
- current_schema = entries[0][0]
- return current_schema == self.schema_version
+ if entries is not None:
+ current_schema = entries[0][0]
+ result = (current_schema == self.schema_version)
+ detected_version = current_schema)
except IndexError:
- return False
+ pass
except self.db.OperationalError:
- return False
+ pass
except self.db.ProgrammingError:
- return False
+ pass
+ return (result, detected_version)
def _preparesql(self):
"""Prepare all SQL statements for the relevant DB backend"""
@@ -614,7 +617,8 @@ class SQLitePackageDB(SQLPackageDatabase):
self.cursor = self.db.cursor()
self._preparesql()
- if not self.schema_is_current():
+ schema_check = self.schema_is_current()
+ if not schema_check[0]:
print 'Schema is outdated, flushing!'
self.initdb = True
if self.initdb:
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] packages:master commit in: dbgenerator/
@ 2011-07-08 2:30 Robin H. Johnson
0 siblings, 0 replies; 6+ messages in thread
From: Robin H. Johnson @ 2011-07-08 2:30 UTC (permalink / raw
To: gentoo-commits
commit: eb3c8d6325dcfab12e9a949717c88b17538615a1
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 8 02:30:48 2011 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 02:30:48 2011 +0000
URL: http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=eb3c8d63
Fix typo.
---
dbgenerator/database.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dbgenerator/database.py b/dbgenerator/database.py
index 6698d90..f6f1a09 100644
--- a/dbgenerator/database.py
+++ b/dbgenerator/database.py
@@ -558,7 +558,7 @@ class SQLPackageDatabase(object):
if entries is not None:
current_schema = entries[0][0]
result = (current_schema == self.schema_version)
- detected_version = current_schema)
+ detected_version = current_schema
except IndexError:
pass
except self.db.OperationalError:
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] packages:master commit in: dbgenerator/
@ 2013-04-14 21:01 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2013-04-14 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 54e744ceb814a968f03d5c95a5f99b1e3a9f08fb
Author: Brian Harring <ferringb <AT> chromium <DOT> org>
AuthorDate: Sun Apr 14 20:57:44 2013 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 21:01:27 2013 +0000
URL: http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=54e744ce
Remove unused code.
---
dbgenerator/backend.py | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/dbgenerator/backend.py b/dbgenerator/backend.py
index bdd8691..1330646 100644
--- a/dbgenerator/backend.py
+++ b/dbgenerator/backend.py
@@ -106,11 +106,6 @@ class domain_repo_interface:
self.current_repo.location, "profiles/package.mask")):
newatom = atom(line.strip())
d.setdefault(newatom.key, []).append(newatom)
- if not newatom.key in self.pmaskatoms:
- self.pmaskatoms[newatom.key] = newatom
- else:
- self.pmaskatoms[newatom.key] = newatom.intersect(
- self.pmaskatoms[newatom.key])
except IOError, oe:
if oe.errno != errno.ENOENT:
raise
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] packages:master commit in: dbgenerator/
@ 2014-01-25 15:09 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2014-01-25 15:09 UTC (permalink / raw
To: gentoo-commits
commit: 4fd29cf6d1b0c68891693d5ba24b683fe05f2049
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 15:09:42 2014 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 15:09:42 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=4fd29cf6
Bump schema to add the arm64 arch
---
dbgenerator/database.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dbgenerator/database.py b/dbgenerator/database.py
index f6f1a09..346dd41 100644
--- a/dbgenerator/database.py
+++ b/dbgenerator/database.py
@@ -29,7 +29,7 @@ class SQLPackageDatabase(object):
arches = frozenset(ConstData.arches['all'])
# If you change the database structure below, you should
# increment this number
- schema_version = 72
+ schema_version = 73
# These are used to cache the various relations and
# avoid more SELECT queries just to find the relations.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] packages:master commit in: dbgenerator/
@ 2014-01-25 15:42 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2014-01-25 15:42 UTC (permalink / raw
To: gentoo-commits
commit: c81df5fa5a67876dd77cc36aaef7504b2af1c171
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 15:42:34 2014 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 15:42:34 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=c81df5fa
Fix schema check for MySQL
---
dbgenerator/database.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dbgenerator/database.py b/dbgenerator/database.py
index 346dd41..6bb0269 100644
--- a/dbgenerator/database.py
+++ b/dbgenerator/database.py
@@ -558,14 +558,13 @@ class SQLPackageDatabase(object):
if entries is not None:
current_schema = entries[0][0]
result = (current_schema == self.schema_version)
- detected_version = current_schema
except IndexError:
pass
except self.db.OperationalError:
pass
except self.db.ProgrammingError:
pass
- return (result, detected_version)
+ return (result, current_schema)
def _preparesql(self):
"""Prepare all SQL statements for the relevant DB backend"""
@@ -660,7 +659,7 @@ class MySQLPackageDB(SQLPackageDatabase):
self.initdb = False
self._preparesql()
- if not self.schema_is_current():
+ if not self.schema_is_current()[0]:
print 'Schema is outdated, flushing!'
self.initdb = True
if self.initdb:
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] packages:master commit in: dbgenerator/
@ 2014-03-17 15:39 Alec Warner
0 siblings, 0 replies; 6+ messages in thread
From: Alec Warner @ 2014-03-17 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 0f3cfe188e046e43d4858c40c9b5248e3096de23
Author: Alec Warner <antarus <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 15:34:13 2014 +0000
Commit: Alec Warner <antarus <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 15:34:13 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=packages.git;a=commit;h=0f3cfe18
iter_read_bash moved to bash module.
---
dbgenerator/backend.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dbgenerator/backend.py b/dbgenerator/backend.py
index 1330646..d51f3f8 100644
--- a/dbgenerator/backend.py
+++ b/dbgenerator/backend.py
@@ -9,7 +9,7 @@ from pkgcore.ebuild.repository import UnconfiguredTree, SlavedTree
from pkgcore.restrictions.packages import OrRestriction
from pkgcore.util.repo_utils import get_raw_repos, get_virtual_repos
from snakeoil.lists import unstable_unique
-from snakeoil.fileutils import iter_read_bash
+from snakeoil.bash import iter_read_bash
from snakeoil.osutils import pjoin
import os
import errno
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-17 15:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-17 15:39 [gentoo-commits] packages:master commit in: dbgenerator/ Alec Warner
-- strict thread matches above, loose matches on Subject: below --
2014-01-25 15:42 Christian Ruppert
2014-01-25 15:09 Christian Ruppert
2013-04-14 21:01 Christian Ruppert
2011-07-08 2:30 Robin H. Johnson
2011-07-08 1:52 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox