# HG changeset patch
# User Alexandre Fayolle <alexandre.fayolle@logilab.fr>
# Date 1265043182 -3600
# Node ID 4755ef8253cdeacb838c6995d6f8024c22fe354f
# Parent  8cd447d11aedc9b5d78f9ab019fc01f5e3d849a9# Parent  df7e0550cd90c630b51f5dfd8aa6b87f65c0ff21
merge

diff -r df7e0550cd90 -r 4755ef8253cd server/sqlutils.py
--- a/server/sqlutils.py	Mon Feb 01 16:59:26 2010 +0100
+++ b/server/sqlutils.py	Mon Feb 01 17:53:02 2010 +0100
@@ -174,7 +174,7 @@
         cmd = self.dbhelper.backup_command(self.dbname, self.dbhost,
                                            self.dbuser, backupfile,
                                            keepownership=False)
-        if subprocess.call(cmd):
+        if subprocess.call(cmd, shell=isinstance(cmd, str)):
             raise Exception('Failed command: %s' % cmd)
 
     def restore_from_file(self, backupfile, confirm, drop=True):
@@ -183,7 +183,7 @@
                                                   self.encoding,
                                                   keepownership=False,
                                                   drop=drop):
-            if subprocess.call(cmd):
+            if subprocess.call(cmd, shell=isinstance(cmd, str)):
                 print '-> Failed command: %s' % cmd
                 if not confirm('Continue anyway?', default='n'):
                     raise Exception('Failed command: %s' % cmd)