msmith - in flumotion/branches/platform-3: . flumotion/component/consumers/httpstreamer flumotion/manager

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Thu Dec 27 12:39:10 2007
New Revision: 6039

Modified:
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/component/consumers/httpstreamer/resources.py
   flumotion/branches/platform-3/flumotion/manager/manager.py
Log:
    * flumotion/component/consumers/httpstreamer/resources.py:
      Fix previous commit to have valid syntax. Grr.
    * flumotion/manager/manager.py:
      Add an argument to a debug call so it matches the argument string.



Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Thu Dec 27 12:39:10 2007
@@ -1,3 +1,10 @@
+2007-12-27  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/component/consumers/httpstreamer/resources.py:
+	  Fix previous commit to have valid syntax. Grr.
+	* flumotion/manager/manager.py:
+	  Add an argument to a debug call so it matches the argument string.
+
 2007-12-10  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/component/consumers/httpstreamer/resources.py:

Modified: flumotion/branches/platform-3/flumotion/component/consumers/httpstreamer/resources.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/component/consumers/httpstreamer/resources.py	(original)
+++ flumotion/branches/platform-3/flumotion/component/consumers/httpstreamer/resources.py	Thu Dec 27 12:39:10 2007
@@ -249,9 +249,8 @@
 
             # Bug in python 2.4.3, see http://sourceforge.net/tracker/index.php?func=detail&aid=1494314&group_id=5470&atid=105470
             if version[:3] == (2, 4, 3) and \
-                not hasattr(socket, "has_2_4_3_patch"):
-                    self.warning(
-                        'Setting hardmax to 1024 due to python 2.4.3 bug')
+                    not hasattr(socket, "has_2_4_3_patch"):
+                self.warning('Setting hardmax to 1024 due to python 2.4.3 bug')
                 hardmax = 1024
 
             if neededfds > softmax:

Modified: flumotion/branches/platform-3/flumotion/manager/manager.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/manager/manager.py	(original)
+++ flumotion/branches/platform-3/flumotion/manager/manager.py	Thu Dec 27 12:39:10 2007
@@ -931,7 +931,7 @@
                         "the manager.")),
                         debug=("Updating internal conf from running conf:\n"
                            + diffMsg))
-                    self.warning('updating internal component state for %r')
+                    self.warning('updating internal component state for %r', state)
                     self.debug('changes to conf: %s',
                                config.dictDiffMessageString(diff))
                     state.set('config', conf)