merge stable
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Wed, 20 Jan 2010 17:07:48 +0100
branchstable
changeset 4299 96d347c3247e
parent 4298 2ca56131079e (diff)
parent 4289 890dc89516f1 (current diff)
child 4313 5d8196a105a7
merge
--- a/server/sqlutils.py	Wed Jan 20 11:31:28 2010 +0100
+++ b/server/sqlutils.py	Wed Jan 20 17:07:48 2010 +0100
@@ -8,6 +8,7 @@
 __docformat__ = "restructuredtext en"
 
 import os
+import subprocess
 from os.path import exists
 from warnings import warn
 from datetime import datetime, date, timedelta
@@ -173,7 +174,7 @@
         cmd = self.dbhelper.backup_command(self.dbname, self.dbhost,
                                            self.dbuser, backupfile,
                                            keepownership=False)
-        if os.system(cmd):
+        if subprocess.call(cmd):
             raise Exception('Failed command: %s' % cmd)
 
     def restore_from_file(self, backupfile, confirm, drop=True):
@@ -182,7 +183,7 @@
                                                   self.encoding,
                                                   keepownership=False,
                                                   drop=drop):
-            if os.system(cmd):
+            if subprocess.call(cmd):
                 print '-> Failed command: %s' % cmd
                 if not confirm('Continue anyway?', default='n'):
                     raise Exception('Failed command: %s' % cmd)