View | Details | Raw Unified | Return to bug 36923
Collapse All | Expand All

(-)a/ucs-4.0-0/management/univention-system-info/umc/python/sysinfo/__init__.py (-6 / +5 lines)
 Lines 112-132   class Instance(umcm.Base): Link Here 
112
			result = {}
112
			result = {}
113
			for line in stdout.splitlines():
113
			for line in stdout.splitlines():
114
				try:
114
				try:
115
					info, value = line.split(':')
115
					info, value = line.split(':', 1)
116
					result[info] = value
116
					result[info] = value
117
				except:
117
				except ValueError:
118
					pass
118
					pass
119
			if result['mem']:
119
			if result.get('mem'):
120
				match = self.mem_regex.match(result['mem'])
120
				match = self.mem_regex.match(result['mem'])
121
				if match:
121
				if match:
122
					try:
122
					try:
123
						converted_mem = (float(match.groups()[0]) / 1048576)
123
						converted_mem = (float(match.groups()[0]) / 1048576)
124
						result['mem'] = '%.2f GB' % converted_mem
124
						result['mem'] = '%.2f GB' % converted_mem
125
						result['mem'] = request['mem'].replace('.', ',')
125
						result['mem'] = request['mem'].replace('.', ',')
126
					except:
126
					except (IndexError, ValueError):
127
						pass
127
						pass
128
			if result['Temp']:
128
			result.pop('Temp', None) # remove unnecessary entry
129
				del result['Temp'] # remove unnecessary entry
130
			request.status = SUCCESS
129
			request.status = SUCCESS
131
130
132
		self.finished(request.id, result)
131
		self.finished(request.id, result)

Return to bug 36923