Ticket #3337: get_xo_serial.patch

src/jarabe/journal/misc.py

@@ -1 +1 @@
 # Copyright (C) 2007, One Laptop Per Child
 # Copyright (C) 2010, Paraguay Educa <tecnologia@paraguayeduca.org>
+# Copyright (C) 2012, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -323 +324 @@
     return serial_number
 
 def get_xo_serial():
-    path = '/ofw/serial-number'
+    _ofw_serial = '/ofw/serial-number'
+    _proc_serial = '/proc/device-tree/serial-number'
 
+    serial = None
+    if os.path.exists(_ofw_serial):
+        serial = read_file(_ofw_serial)
+    elif os.path.exists(_proc_serial):
+        serial = read_file(_proc_serial)
+    return serial
+        
+def read_file(path):
     if os.access(path, os.R_OK) == 0:
         return None
 
-    file_descriptor = open(path, 'r')
-    content = file_descriptor.read()
-    file_descriptor.close()
-
-    if content:
-        return content.strip()
+    fd = open(path, 'r')
+    value = fd.read()
+    fd.close()
+    if value:
+        value = value.strip('\n')
+        return value
     else:
-        logging.error('No serial number at %s', path)
         return None
 
+
 def get_nick():
     client = gconf.client_get_default()
     return client.get_string("/desktop/sugar/user/nick")