From a92d13898a15712d3f72aeb46dff5e5f504749fd Mon Sep 17 00:00:00 2001 From: Bastian Eicher Date: Wed, 2 Jun 2010 17:36:54 +0200 Subject: [PATCH] Replaced hard-coded ':' as path separator symbol with os.pathsep --- zeroinstall/injector/model.py | 4 ++-- zeroinstall/support/__init__.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zeroinstall/injector/model.py b/zeroinstall/injector/model.py index c18fecd..b469c78 100644 --- a/zeroinstall/injector/model.py +++ b/zeroinstall/injector/model.py @@ -243,9 +243,9 @@ class EnvironmentBinding(Binding): if old_value is None: return extra if self.mode == EnvironmentBinding.PREPEND: - return extra + ':' + old_value + return extra + os.pathsep + old_value else: - return old_value + ':' + extra + return old_value + os.pathsep + extra def _toxml(self, doc): """Create a DOM element for this binding. diff --git a/zeroinstall/support/__init__.py b/zeroinstall/support/__init__.py index 5e5aa1e..6edf5ae 100644 --- a/zeroinstall/support/__init__.py +++ b/zeroinstall/support/__init__.py @@ -21,7 +21,9 @@ def find_in_path(prog): @since: 0.27 """ if os.path.isabs(prog): return prog - for d in os.environ.get('PATH', '/bin:/usr/bin').split(':'): + if os.name == "nt": + prog += '.exe' + for d in os.environ.get('PATH', '/bin:/usr/bin').split(os.pathsep): path = os.path.join(d, prog) if os.path.isfile(path): return path -- 2.11.4.GIT