rpathsync / rmake (http://wiki.rpath.com/wiki/rMake)
rMake facilitates building packages consistently across computers with dissimilar environments.
| commit 1298: | d3fcda67c56b |
| parent 1297: | dffd99e76b4f |
| branch: | default |
More postgres fixes.
8 weeks ago
Changed (Δ23 bytes):
raw changeset »
rmake/db/jobstore.py (6 lines added, 6 lines removed)
rmake/db/nodestore.py (1 lines added, 1 lines removed)
rmake/db/schema.py (2 lines added, 2 lines removed)
Up to file-list rmake/db/jobstore.py:
| … | … | @@ -71,7 +71,7 @@ class JobStore(object): |
71 |
71 |
cu = self.db.cursor() |
72 |
72 |
cu.execute(""" |
73 |
73 |
CREATE TEMPORARY TABLE tjobIdList( |
74 |
jobId |
|
74 |
jobId integer |
|
75 |
75 |
)""", start_transaction=False) |
76 |
76 |
|
77 |
77 |
try: |
| … | … | @@ -241,11 +241,11 @@ class JobStore(object): |
241 |
241 |
def getTroves(self, troveList): |
242 |
242 |
cu = self.db.cursor() |
243 |
243 |
cu.execute('''CREATE TEMPORARY TABLE tTroveInfo( |
244 |
jobId INT, |
|
245 |
troveName STR, |
|
246 |
version STR, |
|
247 |
flavor STR, |
|
248 |
|
|
244 |
jobId integer, |
|
245 |
troveName text, |
|
246 |
version text, |
|
247 |
flavor text, |
|
248 |
context text |
|
249 |
249 |
)''', start_transaction=False) |
250 |
250 |
try: |
251 |
251 |
Up to file-list rmake/db/nodestore.py:
| … | … | @@ -55,7 +55,7 @@ class NodeStore(object): |
55 |
55 |
cu.execute("""UPDATE BuildTroves set chrootId=0 WHERE troveId=? |
56 |
56 |
AND chrootId=?""", troveId, chrootId) |
57 |
57 |
for path in newPaths: |
58 |
self._createChrootId(cu, nodeName, path, |
|
58 |
self._createChrootId(cu, nodeName, path, None) |
|
59 |
59 |
|
60 |
60 |
def getNodes(self, names): |
61 |
61 |
cu = self.db.cursor() |
Up to file-list rmake/db/schema.py:
| … | … | @@ -268,8 +268,8 @@ def createChroots(db): |
268 |
268 |
chrootId %(PRIMARYKEY)s, |
269 |
269 |
nodeName TEXT, |
270 |
270 |
path TEXT, |
271 |
troveId INTEGER NOT NULL |
|
272 |
REFERENCES BuildTroves ON DELETE CASCADE, |
|
271 |
troveId INTEGER |
|
272 |
REFERENCES BuildTroves ON DELETE SET NULL, |
|
273 |
273 |
active INTEGER NOT NULL |
274 |
274 |
)""" % db.keywords) |
275 |
275 |
db.tables["Chroots"] = [] |
