# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1265046947 -3600
# Node ID c0f41f53f1c36a06621ca5a3bc680ee3d2926e5f
# Parent  709bc9ea6d1eaab997ab3a7697ec3b9a78208aaf# Parent  4755ef8253cdeacb838c6995d6f8024c22fe354f
merge

diff -r 709bc9ea6d1e -r c0f41f53f1c3 doc/book/en/admin/setup.rst
--- a/doc/book/en/admin/setup.rst	Mon Feb 01 18:55:16 2010 +0100
+++ b/doc/book/en/admin/setup.rst	Mon Feb 01 18:55:47 2010 +0100
@@ -230,9 +230,9 @@
 --------------------------------
 
 This currently assumes that the instances configurations is located
-at C:\etc\cubicweb.d.
+at C:\\etc\\cubicweb.d.
 
-For a cube 'my_cube', you will then find C:\etc\cubicweb.d\my_cube\win32svc.py
+For a cube 'my_cube', you will then find C:\\etc\\cubicweb.d\\my_cube\\win32svc.py
 that has to be used thusly::
 
   win32svc install
diff -r 709bc9ea6d1e -r c0f41f53f1c3 server/sqlutils.py
--- a/server/sqlutils.py	Mon Feb 01 18:55:16 2010 +0100
+++ b/server/sqlutils.py	Mon Feb 01 18:55:47 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)