fix CheckForNewDisks

diff --git a/source/steps/CheckForNewDisks.py b/source/steps/CheckForNewDisks.py
index 1502223..e5af3f1 100644 (file)
--- a/source/steps/CheckForNewDisks.py
+++ b/source/steps/CheckForNewDisks.py
@@ -81,7 +81,7 @@ def Run( vars, log ):
         # this is the lvm partition, if it exists on that device
         lvm_partition= InstallPartitionDisks.get_partition_path_from_device( device, vars, log )
         cmd = "pvdisplay %s | grep -q 'planetlab'" % lvm_partition
         # this is the lvm partition, if it exists on that device
         lvm_partition= InstallPartitionDisks.get_partition_path_from_device( device, vars, log )
         cmd = "pvdisplay %s | grep -q 'planetlab'" % lvm_partition

-        already_added= utils.sysexec_noerr(cmd, log)
+        already_added = utils.sysexec_noerr(cmd, log, shell=True)

 
         if already_added:
             log.write( "It appears %s is part of the volume group, continuing.\n" %
 
         if already_added:
             log.write( "It appears %s is part of the volume group, continuing.\n" %

diff --git a/source/utils.py b/source/utils.py
index 02a30cd..58c8e48 100644 (file)
--- a/source/utils.py
+++ b/source/utils.py
@@ -117,8 +117,7 @@ def removedir( path ):
     return 1
 
 
     return 1
 
 

-
-def sysexec( cmd, log= None, fsck = False ):
+def sysexec( cmd, log=None, fsck=False, shell=False ):

     """
     execute a system command, output the results to the logger
     if log <> None
     """
     execute a system command, output the results to the logger
     if log <> None


@@ -127,14 +126,19 @@ def sysexec( cmd, log= None, fsck = False ):
     0 if failed. A BootManagerException is raised if the command
     was unable to execute or was interrupted by the user with Ctrl+C
     """
     0 if failed. A BootManagerException is raised if the command
     was unable to execute or was interrupted by the user with Ctrl+C
     """

-    if VERBOSE_MODE:
-        print ("sysexec >>> %s" % cmd)
-

     try:
     try:

-        if cmd.__contains__(">"):
+        # Thierry - Jan. 6 2011
+        # would probably make sense to look for | here as well
+        # however this is fragile and hard to test thoroughly
+        # let the caller set 'shell' when that is desirable
+        if shell or cmd.__contains__(">"):

             prog = subprocess.Popen(cmd, shell=True)
             prog = subprocess.Popen(cmd, shell=True)

+            if VERBOSE_MODE:
+                print ("sysexec (shell mode) >>> %s" % cmd)

         else:
             prog = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         else:
             prog = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE)

+            if VERBOSE_MODE:
+                print ("sysexec >>> %s" % cmd)

     except OSError:
         raise BootManagerException, \
               "Unable to create instance of subprocess.Popen " \
     except OSError:
         raise BootManagerException, \
               "Unable to create instance of subprocess.Popen " \


@@ -170,7 +174,7 @@ def sysexec( cmd, log= None, fsck = False ):
     return 1
 
 
     return 1
 
 

-def sysexec_chroot( path, cmd, log= None ):
+def sysexec_chroot( path, cmd, log=None, shell=False):

     """
     same as sysexec, but inside a chroot
     """
     """
     same as sysexec, but inside a chroot
     """


@@ -182,29 +186,29 @@ def sysexec_chroot( path, cmd, log= None ):
         if not os.path.exists(library):
             shutil.copy("./libc-opendir-hack.so", library)
         preload = "/bin/env LD_PRELOAD=/lib/libc-opendir-hack.so"
         if not os.path.exists(library):
             shutil.copy("./libc-opendir-hack.so", library)
         preload = "/bin/env LD_PRELOAD=/lib/libc-opendir-hack.so"

-    sysexec("chroot %s %s %s" % (path, preload, cmd), log)
+    sysexec("chroot %s %s %s" % (path, preload, cmd), log, shell=shell)

 
 
 
 

-def sysexec_chroot_noerr( path, cmd, log= None ):
+def sysexec_chroot_noerr( path, cmd, log=None, shell=False ):

     """
     same as sysexec_chroot, but capture boot manager exceptions
     """
     try:
         rc= 0
     """
     same as sysexec_chroot, but capture boot manager exceptions
     """
     try:
         rc= 0

-        rc= syexec_chroot( cmd, log )
+        rc= sysexec_chroot( cmd, log, shell=shell )

     except BootManagerException, e:
         pass
 
     return rc
 
 
     except BootManagerException, e:
         pass
 
     return rc
 
 

-def sysexec_noerr( cmd, log= None ):
+def sysexec_noerr( cmd, log=None, shell=False ):

     """
     same as sysexec, but capture boot manager exceptions
     """
     try:
         rc= 0
     """
     same as sysexec, but capture boot manager exceptions
     """
     try:
         rc= 0

-        rc= sysexec( cmd, log )
+        rc= sysexec( cmd, log, shell=shell )

     except BootManagerException, e:
         pass
 
     except BootManagerException, e:
         pass