sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Console: fix reading end byte of text files (by dcbw)

Browse Source
This commit is contained in:
Eduardo Silva 2007-07-16 11:59:54 -04:00
parent a5338e054e
commit 9d05b2e0a7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
services/console/interface/xo/system.py
View File

@ -33,7 +33,7 @@ class XO_System(gtk.Fixed):
table.set_row_spacings(7) table.set_row_spacings(7)
# BUILD # BUILD
build = self._read_file('/boot/olpc_build').split('\n')[0] build = self._read_file('/boot/olpc_build')
label_build = Label('OLPC Build:', Label.DESCRIPTION) label_build = Label('OLPC Build:', Label.DESCRIPTION)
label_build_value = Label(str(build), Label.DESCRIPTION) label_build_value = Label(str(build), Label.DESCRIPTION)
@ -44,12 +44,12 @@ class XO_System(gtk.Fixed):
Label.DESCRIPTION) Label.DESCRIPTION)
# FIRMWARE # FIRMWARE
firmware = self._read_file('/ofw/ec-name').split('\n')[0] firmware = self._read_file('/ofw/ec-name')
label_firmware = Label('XO Firmware:', Label.DESCRIPTION) label_firmware = Label('XO Firmware:', Label.DESCRIPTION)
label_firmware_value = Label(firmware, Label.DESCRIPTION) label_firmware_value = Label(firmware, Label.DESCRIPTION)
# SERIAL NUMBER # SERIAL NUMBER
serial = self._read_file('/ofw/serial-number').split('\n')[0] serial = self._read_file('/ofw/serial-number')
label_serial = Label('XO Serial Number:', Label.DESCRIPTION) label_serial = Label('XO Serial Number:', Label.DESCRIPTION)
label_serial_value = Label(serial, Label.DESCRIPTION) label_serial_value = Label(serial, Label.DESCRIPTION)
@ -83,6 +83,9 @@ class XO_System(gtk.Fixed):
value = f.read() value = f.read()
f.close() f.close()
value = value.split('\n')[0]
if value[len(value) - 1] == '\x00':
value = value[:len(value) - 1]
return value return value
except: except:
return "None" return "None"