Attachment #182682 for bug #250188

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

Lines 86-91 Link Here

(-)usr/local/lib/qemulator/qemulator.py.orig (+1 lines)
86	#print "basedir: " + basedir	86	#print "basedir: " + basedir
87	basedir = basedir.replace ( '/bin', '' )	87	basedir = basedir.replace ( '/bin', '' )
88	basedir = basedir.replace ( '/lib/qemulator', '' )	88	basedir = basedir.replace ( '/lib/qemulator', '' )
		89	basedir = basedir.replace ( '/lib64/qemulator', '' )
89	sys.path.append(basedir)	90	sys.path.append(basedir)
90	bindir = basedir + "/bin"	91	bindir = basedir + "/bin"
91	#print "bindir: " + bindir	92	#print "bindir: " + bindir

Lines 55-60 Link Here

(-)usr/local/lib/qemulator/qml_audioenviron.py.orig (+1 lines)
55	#print "basedir: " + basedir	55	#print "basedir: " + basedir
56	basedir = basedir.replace ( '/bin', '' )	56	basedir = basedir.replace ( '/bin', '' )
57	basedir = basedir.replace ( '/lib/qemulator', '' )	57	basedir = basedir.replace ( '/lib/qemulator', '' )
		58	basedir = basedir.replace ( '/lib64/qemulator', '' )
58	sys.path.append(basedir)	59	sys.path.append(basedir)
59	bindir = basedir + "/bin"	60	bindir = basedir + "/bin"
60	#print "bindir: " + bindir	61	#print "bindir: " + bindir

Lines 55-60 Link Here

(-)usr/local/lib/qemulator/qml_configuration.py.orig (-1 / +2 lines)
55		55
56	basedir = basedir.replace ( '/bin', '' )	56	basedir = basedir.replace ( '/bin', '' )
57	basedir = basedir.replace ( '/lib/qemulator', '' )	57	basedir = basedir.replace ( '/lib/qemulator', '' )
		58	basedir = basedir.replace ( '/lib64/qemulator', '' )
58		59
59	APP = 'Qemulator'	60	APP = 'Qemulator'
60	#DIR = 'locale'	61	#DIR = 'locale'
Lines 604-607 Link Here
604	except:	605	except:
605	outdata = { }	606	outdata = { }
606	print "no config file"	607	print "no config file"
607	return outdata	608	return outdata

Lines 139-144 Link Here

(-)usr/local/lib/qemulator/qml_controlmon.py.orig (+1 lines)
139		139
140	self.basedir = basedir.replace ( '/bin', '' )	140	self.basedir = basedir.replace ( '/bin', '' )
141	self.basedir = self.basedir.replace ( '/lib/qemulator', '' )	141	self.basedir = self.basedir.replace ( '/lib/qemulator', '' )
		142	self.basedir = self.basedir.replace ( '/lib64/qemulator', '' )
142		143
143		144
144	print "basedir: " + self.basedir	145	print "basedir: " + self.basedir

Lines 45-50 Link Here

(-)usr/local/lib/qemulator/qml_filehandlers.py.orig (-1 / +2 lines)
45		45
46	basedir = basedir.replace ( '/bin', '' )	46	basedir = basedir.replace ( '/bin', '' )
47	basedir = basedir.replace ( '/lib/qemulator', '' )	47	basedir = basedir.replace ( '/lib/qemulator', '' )
		48	basedir = basedir.replace ( '/lib64/qemulator', '' )
48	sys.path.append(basedir)	49	sys.path.append(basedir)
49	bindir = basedir + "/bin"	50	bindir = basedir + "/bin"
50	libdir = basedir + "/lib/qemulator"	51	libdir = basedir + "/lib/qemulator"
Lines 244-247 Link Here
244	returnmesg = "no command given!"	245	returnmesg = "no command given!"
245	return returnmesg	246	return returnmesg
246		247
247		248

Lines 56-61 Link Here

(-)usr/local/lib/qemulator/qml_imagecreation.py.orig (-1 / +2 lines)
56		56
57	basedir = basedir.replace ( '/bin', '' )	57	basedir = basedir.replace ( '/bin', '' )
58	basedir = basedir.replace ( '/lib/qemulator', '' )	58	basedir = basedir.replace ( '/lib/qemulator', '' )
		59	basedir = basedir.replace ( '/lib64/qemulator', '' )
59		60
60	APP = 'Qemulator'	61	APP = 'Qemulator'
61	#DIR = 'locale'	62	#DIR = 'locale'
Lines 258-261 Link Here
258	pass	259	pass
259		260
260	def return_newimage(self):	261	def return_newimage(self):
261	return self.newimage	262	return self.newimage

Lines 58-63 Link Here

(-)usr/local/lib/qemulator/qml_installwizzard.py.orig (-1 / +2 lines)
58		58
59	basedir = basedir.replace ( '/bin', '' )	59	basedir = basedir.replace ( '/bin', '' )
60	basedir = basedir.replace ( '/lib/qemulator', '' )	60	basedir = basedir.replace ( '/lib/qemulator', '' )
		61	basedir = basedir.replace ( '/lib64/qemulator', '' )
61	pixmapdir = basedir + "/share/pixmaps/qemulator"	62	pixmapdir = basedir + "/share/pixmaps/qemulator"
62		63
63	APP = 'Qemulator'	64	APP = 'Qemulator'
Lines 756-759 Link Here
756	isset = True	757	isset = True
757	else:	758	else:
758	isset = False	759	isset = False
759	return isset	760	return isset

Lines 59-64 Link Here

(-)usr/local/lib/qemulator/qml_machinesetup.py.orig (+1 lines)
59		59
60	basedir = basedir.replace ( '/bin', '' )	60	basedir = basedir.replace ( '/bin', '' )
61	basedir = basedir.replace ( '/lib/qemulator', '' )	61	basedir = basedir.replace ( '/lib/qemulator', '' )
		62	basedir = basedir.replace ( '/lib64/qemulator', '' )
62	pixmapdir = basedir + "/share/pixmaps/qemulator"	63	pixmapdir = basedir + "/share/pixmaps/qemulator"
63		64
64	APP = 'Qemulator'	65	APP = 'Qemulator'

Lines 83-88 Link Here

(-)usr/local/lib/qemulator/qml_tools.py.orig (+1 lines)
83	#print "basedir: " + basedir	83	#print "basedir: " + basedir
84	basedir = basedir.replace ( '/bin', '' )	84	basedir = basedir.replace ( '/bin', '' )
85	basedir = basedir.replace ( '/lib/qemulator', '' )	85	basedir = basedir.replace ( '/lib/qemulator', '' )
		86	basedir = basedir.replace ( '/lib64/qemulator', '' )
86	sys.path.append(basedir)	87	sys.path.append(basedir)
87	bindir = basedir + "/bin"	88	bindir = basedir + "/bin"
88	#print "bindir: " + bindir	89	#print "bindir: " + bindir

Return to bug 250188