git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a18a4c8
)
use session.delete(x) rather than del x
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Thu, 19 Jan 2012 17:33:42 +0000
(18:33 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Thu, 19 Jan 2012 17:33:42 +0000
(18:33 +0100)
sfa/importer/sfa-import-openstack.py
patch
|
blob
|
history
sfa/importer/sfa-import-plc.py
patch
|
blob
|
history
sfa/managers/registry_manager.py
patch
|
blob
|
history
sfa/server/sfa-start.py
patch
|
blob
|
history
sfa/storage/alchemy.py
patch
|
blob
|
history
diff --git
a/sfa/importer/sfa-import-openstack.py
b/sfa/importer/sfa-import-openstack.py
index
9794ec7
..
ae3d897
100755
(executable)
--- a/
sfa/importer/sfa-import-openstack.py
+++ b/
sfa/importer/sfa-import-openstack.py
@@
-155,7
+155,7
@@
def main():
record_object = existing_records[ (record_hrn, type) ]
logger.info("Import: removing %s " % record.summary_string())
record_object = existing_records[ (record_hrn, type) ]
logger.info("Import: removing %s " % record.summary_string())
- d
el record_object
+ d
bsession.delete(record_object)
dbsession.commit()
# save pub keys
dbsession.commit()
# save pub keys
diff --git
a/sfa/importer/sfa-import-plc.py
b/sfa/importer/sfa-import-plc.py
index
768473f
..
9076237
100755
(executable)
--- a/
sfa/importer/sfa-import-plc.py
+++ b/
sfa/importer/sfa-import-plc.py
@@
-343,7
+343,7
@@
def main():
try:
record_object = existing_records[(record_hrn, type)]
logger.info("Import: deleting record: %s" % record)
try:
record_object = existing_records[(record_hrn, type)]
logger.info("Import: deleting record: %s" % record)
- d
el record_object
+ d
bsession.delete(record_object)
dbsession.commit()
except:
logger.log_exc("Import: failded to delete record")
dbsession.commit()
except:
logger.log_exc("Import: failded to delete record")
diff --git
a/sfa/managers/registry_manager.py
b/sfa/managers/registry_manager.py
index
218d62b
..
e40772d
100644
(file)
--- a/
sfa/managers/registry_manager.py
+++ b/
sfa/managers/registry_manager.py
@@
-385,7
+385,7
@@
class RegistryManager:
logger.warning("driver.remove failed")
# delete from sfa db
logger.warning("driver.remove failed")
# delete from sfa db
- d
el record
+ d
bsession.delete(record)
dbsession.commit()
return 1
dbsession.commit()
return 1
diff --git
a/sfa/server/sfa-start.py
b/sfa/server/sfa-start.py
index
1f22215
..
8355d1c
100755
(executable)
--- a/
sfa/server/sfa-start.py
+++ b/
sfa/server/sfa-start.py
@@
-144,7
+144,7
@@
def update_cert_records(gids):
for record in records_found:
if record.hrn not in hrns_expected and \
record.hrn != self.api.config.SFA_INTERFACE_HRN:
for record in records_found:
if record.hrn not in hrns_expected and \
record.hrn != self.api.config.SFA_INTERFACE_HRN:
- d
el record
+ d
bsession.delete(record)
# TODO: store urn in the db so we do this in 1 query
for gid in gids:
# TODO: store urn in the db so we do this in 1 query
for gid in gids:
diff --git
a/sfa/storage/alchemy.py
b/sfa/storage/alchemy.py
index
e83a0f1
..
ead5219
100644
(file)
--- a/
sfa/storage/alchemy.py
+++ b/
sfa/storage/alchemy.py
@@
-73,7
+73,7
@@
class Alchemy:
self.commit()
def remove (self, record):
self.commit()
def remove (self, record):
- del record
+ self.delete(record)
self.commit()
####################
self.commit()
####################