merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Mon, 01 Feb 2010 18:55:47 +0100
branchstable
changeset 4422 c0f41f53f1c3
parent 4421 709bc9ea6d1e (current diff)
parent 4418 4755ef8253cd (diff)
child 4423 c1850ef961fc
merge
--- 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
--- 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)