git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstreammaster'
[sfa.git]
/
sfa
/
storage
/
dbschema.py
diff --git
a/sfa/storage/dbschema.py
b/sfa/storage/dbschema.py
index
3776d52
..
4c99fb2
100644
(file)
--- a/
sfa/storage/dbschema.py
+++ b/
sfa/storage/dbschema.py
@@
-120,7
+120,10
@@
class DBSchema:
def nuke (self):
model.drop_tables(self.engine)
# so in this case it's like we haven't initialized the db at all
def nuke (self):
model.drop_tables(self.engine)
# so in this case it's like we haven't initialized the db at all
- migrate.drop_version_control (self.url, self.repository)
+ try:
+ migrate.drop_version_control (self.url, self.repository)
+ except migrate.exceptions.DatabaseNotControlledError:
+ logger.log_exc("Failed to drop version control")
if __name__ == '__main__':
if __name__ == '__main__':