git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reguire gnupg1 on f>=31; sense the system to use gpg1 when installed
[nodemanager.git]
/
database.py
diff --git
a/database.py
b/database.py
index
aef900d
..
a7099bc
100644
(file)
--- a/
database.py
+++ b/
database.py
@@
-98,10
+98,12
@@
keys."""
if rec['timestamp'] < self._min_timestamp: return
name = rec['name']
old_rec = self.get(name)
if rec['timestamp'] < self._min_timestamp: return
name = rec['name']
old_rec = self.get(name)
- if old_rec == None: self[name] = rec
+ if old_rec == None:
+ self[name] = rec
elif rec['timestamp'] > old_rec['timestamp']:
for key in list(old_rec.keys()):
elif rec['timestamp'] > old_rec['timestamp']:
for key in list(old_rec.keys()):
- if not key.startswith('_'): del old_rec[key]
+ if not key.startswith('_'):
+ del old_rec[key]
old_rec.update(rec)
def set_min_timestamp(self, ts):
old_rec.update(rec)
def set_min_timestamp(self, ts):
@@
-183,7
+185,8
@@
It proceeds to handle dump requests forever."""
dump_requested = False
db_lock.release()
try:
dump_requested = False
db_lock.release()
try:
- tools.write_file(DB_FILE, lambda f: f.write(db_pickle))
+ tools.write_file(
+ DB_FILE, lambda f: f.write(db_pickle), binary=True)
logger.log_database(db)
except:
logger.log_exc("database.start: failed to pickle/dump")
logger.log_database(db)
except:
logger.log_exc("database.start: failed to pickle/dump")