[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 7192c7d23bfe705cf91457bbafa55882461f4fa0
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Dec 18 08:39:42 2008 +0100

    ousaged: gathering resume reason now works for Openmoko devices

diff --git a/framework/subsystems/ousaged/helpers.py b/framework/subsystems/ousaged/helpers.py
index af579c9..4e95fa7 100644
--- a/framework/subsystems/ousaged/helpers.py
+++ b/framework/subsystems/ousaged/helpers.py
@@ -25,12 +25,16 @@ def writeToFile( path, value ):
         f.write( "%s\n" % value )
 
 #============================================================================#
-def hardwareName( path, value ):
+def hardwareName():
 #============================================================================#
     value = readFromFile( "/proc/cpuinfo" )
     for line in value.split( '\n' ):
-        left, right = line.split( ':' )
-        if left.strip().startswith( "Hardware" ):
-            return right.strip()
+        try:
+            left, right = line.split( ':' )
+        except ValueError:
+            continue
+        else:
+            if left.strip().startswith( "Hardware" ):
+                return right.strip()
     return "unknown"
 
diff --git a/framework/subsystems/ousaged/lowlevel.py b/framework/subsystems/ousaged/lowlevel.py
index d17037d..1798b61 100644
--- a/framework/subsystems/ousaged/lowlevel.py
+++ b/framework/subsystems/ousaged/lowlevel.py
@@ -14,10 +14,13 @@ Low level (device specific) suspend/resume handling.
 """
 
 MODULE_NAME = "ousaged"
-__version__ = "0.0.0"
+__version__ = "0.0.1"
 
 from helpers import readFromFile, writeToFile, hardwareName
 
+import logging
+logger = logging.getLogger( MODULE_NAME )
+
 #============================================================================#
 class GenericResumeReason( object ):
 #============================================================================#
@@ -63,19 +66,24 @@ class OpenmokoResumeReason( object ):
         }
 
     def gather( self ):
-        reasons = readFromFile( SYSFS_RESUME_REASON_PATH )
+        reasons = readFromFile( self.__class__.SYSFS_RESUME_REASON_PATH ).split( '\n' )
         for line in reasons:
             if line.startswith( "*" ):
                 reason = line[2:]
                 break
         else:
+            print "nope"
+            logger.info( "No resume reason marked in %s" % self.__class__.SYSFS_RESUME_REASON_PATH )
             return "unknown"
 
         if reason == "EINT09_PMU":
-            value = readFromFile( SYSFS_RESUME_SUBREASON_PATH )
+            logger.debug( "PMU resume reason marked in %s" % self.__class__.SYSFS_RESUME_REASON_PATH )
+
+            value = readFromFile( self.__class__.SYSFS_RESUME_SUBREASON_PATH )
             try:
                 subreason = self._intmap2[value]
             except KeyError:
+                logger.debug( "Unknown subreason for PMU resume" )
                 return "PMU"
             else:
                 return subreason

-- 
FSO frameworkd Debian packaging