# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1268402141 -3600
# Node ID 15ae9a33a7f2fd30c974ff7359d99d9737d4568c
# Parent  7ee8f128be9edb94cde0af24ce95715a14c39b66
[db backup] fix name error in backup_to_file: we've to pass .confirm all along the chain as for restore

diff -r 7ee8f128be9e -r 15ae9a33a7f2 server/migractions.py
--- a/server/migractions.py	Fri Mar 12 14:52:22 2010 +0100
+++ b/server/migractions.py	Fri Mar 12 14:55:41 2010 +0100
@@ -145,9 +145,9 @@
         try:
             for source in repo.sources:
                 try:
-                    source.backup(osp.join(tmpdir, source.uri))
-                except Exception, exc:
-                    print '-> error trying to backup %s [%s]' % (source.uri, exc)
+                    source.backup(osp.join(tmpdir, source.uri, self.confirm))
+                except Exception, ex:
+                    print '-> error trying to backup %s [%s]' % (source.uri, ex)
                     if not self.confirm('Continue anyway?', default='n'):
                         raise SystemExit(1)
                     else:
@@ -187,7 +187,6 @@
             bkup = tarfile.open(backupfile, 'r|gz')
             bkup.extractall(path=tmpdir)
             bkup.close()
-
         self.config.open_connections_pools = False
         repo = self.repo_connect()
         for source in repo.sources:
diff -r 7ee8f128be9e -r 15ae9a33a7f2 server/sources/extlite.py
--- a/server/sources/extlite.py	Fri Mar 12 14:52:22 2010 +0100
+++ b/server/sources/extlite.py	Fri Mar 12 14:55:41 2010 +0100
@@ -93,11 +93,11 @@
         AbstractSource.__init__(self, repo, appschema, source_config,
                                 *args, **kwargs)
 
-    def backup(self, backupfile):
+    def backup(self, backupfile, confirm):
         """method called to create a backup of the source's data"""
         self.close_pool_connections()
         try:
-            self.sqladapter.backup_to_file(backupfile)
+            self.sqladapter.backup_to_file(backupfile, confirm)
         finally:
             self.open_pool_connections()
 
diff -r 7ee8f128be9e -r 15ae9a33a7f2 server/sources/native.py
--- a/server/sources/native.py	Fri Mar 12 14:52:22 2010 +0100
+++ b/server/sources/native.py	Fri Mar 12 14:55:41 2010 +0100
@@ -13,7 +13,7 @@
 """
 __docformat__ = "restructuredtext en"
 
-from threading import Lock
+from o_threading import Lock
 from datetime import datetime
 from base64 import b64decode, b64encode
 
@@ -216,11 +216,11 @@
         pool.pool_reset()
         self.repo._free_pool(pool)
 
-    def backup(self, backupfile):
+    def backup(self, backupfile, confirm):
         """method called to create a backup of the source's data"""
         self.close_pool_connections()
         try:
-            self.backup_to_file(backupfile)
+            self.backup_to_file(backupfile, confirm)
         finally:
             self.open_pool_connections()
 
diff -r 7ee8f128be9e -r 15ae9a33a7f2 server/sqlutils.py
--- a/server/sqlutils.py	Fri Mar 12 14:52:22 2010 +0100
+++ b/server/sqlutils.py	Fri Mar 12 14:55:41 2010 +0100
@@ -172,7 +172,7 @@
         #self.dbapi_module.type_code_test(cnx.cursor())
         return cnx
 
-    def backup_to_file(self, backupfile):
+    def backup_to_file(self, backupfile, confirm):
         for cmd in self.dbhelper.backup_commands(backupfile=backupfile,
                                                  keepownership=False,
                                                  dbname=self.dbname,