Attachment #273711 for bug #262083

View | Details | Raw Unified | Return to bug 262083 | Differences between
Collapse All | Expand All




            sys.path.append(oolibpath)
            import uno, unohelper
            ### Export an environment that OpenOffice is pleased to work with

            # Added Wrapper for unset LD_LIBRARY_PATH
            if 'LD_LIBRARY_PATH' in os.environ:
                lib_path = os.environ['LD_LIBRARY_PATH']
                if oolibpath in lib_path:
                    pass
                else:
                    os.environ['LD_LIBRARY_PATH'] += os.pathsep + oolibpath
            else:
                os.environ['LD_LIBRARY_PATH'] = oolibpath
            # This old line fails with python 2.7, the above should work with 2.x
            # os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + os.environ['LD_LIBRARY_PATH']
            break
        except ImportError, e:
            sys.path.remove(oolibpath)

Return to bug 262083

Lines 64-70 Link Here

(-)unoconv (-1 / +12 lines)
64	sys.path.append(oolibpath)	64	sys.path.append(oolibpath)
65	import uno, unohelper	65	import uno, unohelper
66	### Export an environment that OpenOffice is pleased to work with	66	### Export an environment that OpenOffice is pleased to work with
67	os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + os.environ['LD_LIBRARY_PATH']	67
		68	# Added Wrapper for unset LD_LIBRARY_PATH
		69	if 'LD_LIBRARY_PATH' in os.environ:
		70	lib_path = os.environ['LD_LIBRARY_PATH']
		71	if oolibpath in lib_path:
		72	pass
		73	else:
		74	os.environ['LD_LIBRARY_PATH'] += os.pathsep + oolibpath
		75	else:
		76	os.environ['LD_LIBRARY_PATH'] = oolibpath
		77	# This old line fails with python 2.7, the above should work with 2.x
		78	# os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + os.environ['LD_LIBRARY_PATH']
68	break	79	break
69	except ImportError, e:	80	except ImportError, e:
70	sys.path.remove(oolibpath)	81	sys.path.remove(oolibpath)