[pkg-fso-commits] [SCM] framworkd debian packageing branch, master, updated. milestone2-110-g76700a0

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 1ee2f3d53b11d7ff4153e06e286168a576bc7922
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Aug 28 21:15:38 2008 +0200

    odeviced and ogsmd: remove remaining LOG statements. Using python logging now

diff --git a/framework/subsystems/odeviced/powercontrol-neo.py b/framework/subsystems/odeviced/powercontrol-neo.py
index 9f6dbea..3d959df 100644
--- a/framework/subsystems/odeviced/powercontrol-neo.py
+++ b/framework/subsystems/odeviced/powercontrol-neo.py
@@ -5,6 +5,9 @@ Open Device Daemon - A plugin for Neo 1973 and Neo FreeRunner specific power con
 (C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
 (C) 2008 Openmoko, Inc.
 GPLv2 or later
+
+Package: odeviced
+Module: powercontrol-neo
 """
 
 MODULE_NAME = "odeviced.powercontrol-neo"
@@ -159,7 +162,6 @@ def factory( prefix, controller ):
     bus = controller.bus
 
     def walk( objects, dirname, fnames ):
-        #LOG( LOG_DEBUG, "scanning in", dirname, "found", fnames )
         if walk.lookForBT and "neo1973-pm-bt.0" in fnames:
             objects.append( NeoBluetoothPowerControl( bus, "%s/%s" % ( dirname, "neo1973-pm-bt.0" ) ) )
             walk.lookForBT = False # only have one BT interface
diff --git a/framework/subsystems/ogsmd/modems/abstract/pdp.py b/framework/subsystems/ogsmd/modems/abstract/pdp.py
index 3fdac8a..8c048c9 100644
--- a/framework/subsystems/ogsmd/modems/abstract/pdp.py
+++ b/framework/subsystems/ogsmd/modems/abstract/pdp.py
@@ -133,10 +133,7 @@ class Pdp( AbstractMediator ):
         os.kill( self.cpid, signal.SIGINT )
 
         # control flow will continue in self._spawnedProcessDone
-
-        #LOG(LOG_INFO, __name__, 'Activate waiting for pppd')
         #p, r = waitpid(self.cpid, 0)
-        #LOG(LOG_INFO, __name__, 'Activate pppd returned', r)
 
     def _spawnedProcessOutput( self, source, condition ):
         """Gets called when ppp outputs anything."""
diff --git a/framework/subsystems/ogsmd/objects.py b/framework/subsystems/ogsmd/objects.py
index e2c2f00..e0a0c0a 100644
--- a/framework/subsystems/ogsmd/objects.py
+++ b/framework/subsystems/ogsmd/objects.py
@@ -16,18 +16,21 @@ Attributes:
     * device = device dbus object singleton
 """
 
-import types
-from framework.config import LOG, LOG_INFO, LOG_ERR, LOG_DEBUG
+MODULE_NAME = "ogsmd.objects"
+__version__ = "0.8.9"
+
 import dbus
 import dbus.service
 from dbus import DBusException
+
 from gobject import timeout_add, idle_add
 import weakref
 import math
 import sys, os
+import types
 
 import logging
-logger = logging.getLogger('ogsmd')
+logger = logging.getLogger( MODULE_NAME )
 
 DBUS_INTERFACE_DEVICE = "org.freesmartphone.GSM.Device"
 DBUS_INTERFACE_SIM = "org.freesmartphone.GSM.SIM"

-- 
framworkd debian packageing