[Pkg-uml-commit] r250 - trunk/src/rootstrap

[Mattia Dongili]

Author: malattia
Date: 2006-11-12 14:22:53 +0100 (Sun, 12 Nov 2006)
New Revision: 250

Modified:
   trunk/src/rootstrap/rootstrap
Log:
ignore -o when running with debug=true set (see http://lists.alioth.debian.org/pipermail/pkg-uml-devel/2006-November/000352.html)

Modified: trunk/src/rootstrap/rootstrap
===================================================================
--- trunk/src/rootstrap/rootstrap	2006-11-12 13:20:27 UTC (rev 249)
+++ trunk/src/rootstrap/rootstrap	2006-11-12 13:22:53 UTC (rev 250)
@@ -59,8 +59,12 @@
     if opt in ('-s', '--image-size'):
         imagesize = long(arg)
     elif opt in ('-o',):
-        log = open(arg,"w")
-        os.dup2(log.fileno(), sys.stdout.fileno())
+		if not config.has_option('global', 'debug') or \
+						config.get('global', 'debug') != 'true':
+				log = open(arg,"w")
+				os.dup2(log.fileno(), sys.stdout.fileno())
+		else:
+				print "Ignoring -o because the debug option is set"
     elif opt in ('-c', '--config'):
         umlargs_extra.append('rsconfig=%s' % os.path.abspath(os.path.expanduser(arg)))
     elif opt in ('-u', '--umlarg'):
@@ -95,9 +99,9 @@
 
 umlargs.extend(['con0=fd:0,fd:1',
                 'con=pts',
-		'root=/dev/root',
-		'rootflags=/',
-		'rootfstype=hostfs',
+				'root=/dev/root',
+				'rootflags=/',
+				'rootfstype=hostfs',
                 'ubd1=' + imagefile,
                 'init=/usr/lib/rootstrap/builder',
                 'devfs=nomount',