re-instate check-vsys-defaults as an ignored step

[tests.git] / system / utils.py

diff --git a/system/utils.py b/system/utils.py
index 19113b0..fbdd3f6 100644 (file)
--- a/system/utils.py
+++ b/system/utils.py
@@ -1,4 +1,6 @@
-# $Id$
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import time, os, re, glob, sys
 from pprint import PrettyPrinter
 
@@ -21,11 +23,13 @@ def pprint(message,spec,depth=2):
 
 
 def system(command,background=False,silent=False):
-    if options.dry_run:
+    if getattr(options,'dry_run',None):
         print 'dry_run:',command
         return 0
     
-    if silent :    command += "2> /dev/null"
+    if silent :    
+        if command.find(';')>=0: command = "(%s) 2> /dev/null" % command
+        else: command += " 2> /dev/null"
     if background: command += " &"
     if silent:
         print '.',
@@ -35,20 +39,17 @@ def system(command,background=False,silent=False):
         # don't show in summary
         print "->",now,'--',
         sys.stdout.flush()
-    return os.system("set -x; " + command)
+    if not silent:
+        command = "set -x; " + command
+    return os.system(command)
 
 ### WARNING : this ALWAYS does its job, even in dry_run mode
 def output_of (command):
     import commands
-#    if options.dry_run:
-#        print 'dry_run',command
-#        return (0,'[[dry-run - fake output]]')
-#    else:
     (code,string) = commands.getstatusoutput(command)
     return (code,string)
 
 
-
 # convenience: translating shell-like pattern into regexp
 def match (string, pattern):
     # tmp - there's probably much simpler