ogsmd: fix GPRS connections with given user. Closes FSO #140

Patch by lindi, thanks a lot!

diff --git a/framework/subsystems/ogsmd/modems/abstract/pdp.py b/framework/subsystems/ogsmd/modems/abstract/pdp.py
index f7036f1..6ea77f6 100644 (file)
--- a/framework/subsystems/ogsmd/modems/abstract/pdp.py
+++ b/framework/subsystems/ogsmd/modems/abstract/pdp.py
@@ -13,7 +13,7 @@ Module: pdp
 
 """
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 
 from .mediator import AbstractMediator
 from .overlay import OverlayFile
@@ -54,7 +54,7 @@ class Pdp( AbstractMediator ):
         # merge with user and password settings
         if user:
             logger.info( "configuring ppp for user '%s' w/ password '%s'" % ( user, password ) )
-            self.ppp_options += [ "user", '"%s"' % user ]
+            self.ppp_options += [ "user", user ]
             self.pds[self.__class__.PPP_PAP_SECRETS_FILENAME] = '%s * "%s" *\n' % ( user or '*', password )
             self.pds[self.__class__.PPP_CHAP_SECRETS_FILENAME] =  '%s * "%s" *\n'% ( user or '*', password )
 

diff --git a/framework/subsystems/ousaged/generic.py b/framework/subsystems/ousaged/generic.py
index 0f13313..d62e79b 100644 (file)
--- a/framework/subsystems/ousaged/generic.py
+++ b/framework/subsystems/ousaged/generic.py
@@ -137,12 +137,10 @@ class DummyResource( AbstractResource ):
 
     @tasklet.tasklet
     def _enable( self ):
-        print "Enabled %s" % self.name
         yield None
 
     @tasklet.tasklet
     def _disable( self ):
-        print "Disabled %s" % self.name
         yield None
 
 #----------------------------------------------------------------------------#
@@ -157,14 +155,12 @@ class ODeviceDResource( AbstractResource ):
         proxy = self.bus.get_object( "org.freesmartphone.odeviced", "/org/freesmartphone/Device/PowerControl/" + self.name )
         iface = dbus.Interface( proxy, "org.freesmartphone.Device.PowerControl" )
         yield tasklet.WaitDBus( iface.SetPower, True)
-        print "Enabled %s" % self.name
 
     @tasklet.tasklet
     def _disable( self ):
         proxy = self.bus.get_object( "org.freesmartphone.odeviced", "/org/freesmartphone/Device/PowerControl/" + self.name )
         iface = dbus.Interface( proxy, "org.freesmartphone.Device.PowerControl" )
         yield tasklet.WaitDBus( iface.SetPower, False )
-        print "Disabled %s" % self.name
 
 #----------------------------------------------------------------------------#
 class OGPSDResource( AbstractResource ):
@@ -178,15 +174,12 @@ class OGPSDResource( AbstractResource ):
         proxy = self.bus.get_object( "org.freesmartphone.ogpsd", "/org/freedesktop/Gypsy" )
         iface = dbus.Interface( proxy, "org.freesmartphone.GPS" )
         yield tasklet.WaitDBus( iface.SetPower, True )
-        print "Enabled %s" % self.name
 
     @tasklet.tasklet
     def _disable( self ):
         proxy = self.bus.get_object( "org.freesmartphone.ogpsd", "/org/freedesktop/Gypsy" )
         iface = dbus.Interface( proxy, "org.freesmartphone.GPS" )
         yield tasklet.WaitDBus( iface.SetPower, False )
-        print "Disabled %s" % self.name
-
 
 #----------------------------------------------------------------------------#
 class ClientResource( AbstractResource ):