wingo - in flumotion/trunk: . flumotion/launch flumotion/manager flumotion/worker

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Wed May  9 19:09:14 2007
New Revision: 4923

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/launch/main.py
   flumotion/trunk/flumotion/manager/main.py
   flumotion/trunk/flumotion/worker/main.py
Log:
2007-05-09  Andy Wingo  <wingo at pobox.com>

	* flumotion/worker/main.py (main): 
	* flumotion/launch/main.py (main): 
	* flumotion/manager/main.py (main): --verbose sets a baseline for
	--debug, not overriding it. Fixes #82.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed May  9 19:09:14 2007
@@ -1,5 +1,10 @@
 2007-05-09  Andy Wingo  <wingo at pobox.com>
 
+	* flumotion/worker/main.py (main): 
+	* flumotion/launch/main.py (main): 
+	* flumotion/manager/main.py (main): --verbose sets a baseline for
+	--debug, not overriding it. Fixes #82.
+
 	* flumotion/manager/component.py (ComponentAvatar.cleanup): Add a
 	comment.
 

Modified: flumotion/trunk/flumotion/launch/main.py
==============================================================================
--- flumotion/trunk/flumotion/launch/main.py	(original)
+++ flumotion/trunk/flumotion/launch/main.py	Wed May  9 19:09:14 2007
@@ -272,7 +272,7 @@
 
     # verbose overrides --debug
     if options.verbose:
-        options.debug = "*:3"
+        log.setFluDebug("*:3")
  
     # handle all options
     if options.version:

Modified: flumotion/trunk/flumotion/manager/main.py
==============================================================================
--- flumotion/trunk/flumotion/manager/main.py	(original)
+++ flumotion/trunk/flumotion/manager/main.py	Wed May  9 19:09:14 2007
@@ -154,9 +154,9 @@
             log.debug('manager', 'Setting configure.%s to %s' % (d, o))
             setattr(configure, d, o)
 
-    # verbose overrides --debug
+    # verbose sets a baseline for --debug
     if options.verbose:
-        options.debug = "*:3"
+        log.setFluDebug("*:3")
 
     # Handle options that don't require a configuration file.
     if options.version:

Modified: flumotion/trunk/flumotion/worker/main.py
==============================================================================
--- flumotion/trunk/flumotion/worker/main.py	(original)
+++ flumotion/trunk/flumotion/worker/main.py	Wed May  9 19:09:14 2007
@@ -168,9 +168,8 @@
             log.debug('worker', 'Setting configure.%s to %s' % (d, o))
             setattr(configure, d, o)
 
-    # verbose overrides --debug; is only a command-line option
     if options.verbose:
-        options.debug = "*:3"
+        log.setFluDebug("*:3")
  
     # apply the command-line debug level if is given through --verbose or -d
     if options.debug: