smolt/sme7/smolt-0.9.8.1-sme.patch3

diff -Nur -x '*.orig' -x '*.rej' smolt-0.9.8.1/client/smolt.py mezzanine_patched_smolt-0.9.8.1/client/smolt.py
--- smolt-0.9.8.1/client/smolt.py       2007-07-01 15:58:05.000000000 -0600
+++ mezzanine_patched_smolt-0.9.8.1/client/smolt.py     2007-07-01 15:56:55.000000000 -0600
@@ -182,7 +182,12 @@
         try:
             self.language = os.environ['LANG']
         except KeyError:
-            self.language = 'Unknown'
+            try:
+                status, lang = commands.getstatusoutput("grep LANG /etc/sysconfig/i18n")
+                if status == 0:
+                    self.language = lang.split('"')[1]
+            except:
+                self.language = 'Unknown'
         try:
             self.platform = hostInfo['system.kernel.machine']
         except KeyError:
@@ -285,7 +290,7 @@
             props = dev.GetAllProperties()
             self.devices[udi] = Device(props)
             if udi == '/org/freedesktop/Hal/devices/computer':
-                status, systemType = commands.getstatusoutput("config gettype SystemMode")
+                status, systemType = commands.getstatusoutput("/sbin/e-smith/config gettype SystemMode")
                 if status == 0:
                     props['system.formfactor'] = systemType
                 try:
@@ -311,7 +316,7 @@
                     except KeyError:
                         product = None
                 if vendor is None or product is None:
-                    dmiOutput = os.popen("dmidecode", "r")
+                    dmiOutput = os.popen("/usr/sbin/dmidecode", "r")
                     section = None
                     sysvendor = None
                     sysproduct = None
1	diff -Nur -x '.orig' -x '.rej' smolt-0.9.8.1/client/smolt.py mezzanine_patched_smolt-0.9.8.1/client/smolt.py
2	--- smolt-0.9.8.1/client/smolt.py 2007-07-01 15:58:05.000000000 -0600
3	+++ mezzanine_patched_smolt-0.9.8.1/client/smolt.py 2007-07-01 15:56:55.000000000 -0600
4	@@ -182,7 +182,12 @@
5	try:
6	self.language = os.environ['LANG']
7	except KeyError:
8	- self.language = 'Unknown'
9	+ try:
10	+ status, lang = commands.getstatusoutput("grep LANG /etc/sysconfig/i18n")
11	+ if status == 0:
12	+ self.language = lang.split('"')[1]
13	+ except:
14	+ self.language = 'Unknown'
15	try:
16	self.platform = hostInfo['system.kernel.machine']
17	except KeyError:
18	@@ -285,7 +290,7 @@
19	props = dev.GetAllProperties()
20	self.devices[udi] = Device(props)
21	if udi == '/org/freedesktop/Hal/devices/computer':
22	- status, systemType = commands.getstatusoutput("config gettype SystemMode")
23	+ status, systemType = commands.getstatusoutput("/sbin/e-smith/config gettype SystemMode")
24	if status == 0:
25	props['system.formfactor'] = systemType
26	try:
27	@@ -311,7 +316,7 @@
28	except KeyError:
29	product = None
30	if vendor is None or product is None:
31	- dmiOutput = os.popen("dmidecode", "r")
32	+ dmiOutput = os.popen("/usr/sbin/dmidecode", "r")
33	section = None
34	sysvendor = None
35	sysproduct = None