diff options
| author | Steven Knight <knight@baldmt.com> | 2003-03-30 16:55:46 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-03-30 16:55:46 (GMT) |
| commit | 786aa89ee387927f0ef142f3328b3c0eebb1da5a (patch) | |
| tree | 8e8f86ec954f00dfba25179cb0257db9369c3b66 /src/engine/SCons/Tool | |
| parent | d3ce17c54525be85011f667f584611cc02ee9a11 (diff) | |
| download | SCons-786aa89ee387927f0ef142f3328b3c0eebb1da5a.zip SCons-786aa89ee387927f0ef142f3328b3c0eebb1da5a.tar.gz SCons-786aa89ee387927f0ef142f3328b3c0eebb1da5a.tar.bz2 | |
Fix a bug when BuildDir(duplicate=0) is used with multiple SConscript files. (Charles Crain)
Diffstat (limited to 'src/engine/SCons/Tool')
| -rw-r--r-- | src/engine/SCons/Tool/Perforce.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/Perforce.py b/src/engine/SCons/Tool/Perforce.py index 7c1a2a7..2f9fb88 100644 --- a/src/engine/SCons/Tool/Perforce.py +++ b/src/engine/SCons/Tool/Perforce.py @@ -79,10 +79,15 @@ def generate(env, platform): if SCons.Util.can_read_reg: # If we can read the registry, add the path to Perforce to our environment. - k=SCons.Util.RegOpenKeyEx(SCons.Util.hkey_mod.HKEY_LOCAL_MACHINE, - 'Software\\Perforce\\environment') - val, tok = SCons.Util.RegQueryValueEx(k, 'P4INSTROOT') - addPathIfNotExists(environ, 'PATH', val) + try: + k=SCons.Util.RegOpenKeyEx(SCons.Util.hkey_mod.HKEY_LOCAL_MACHINE, + 'Software\\Perforce\\environment') + val, tok = SCons.Util.RegQueryValueEx(k, 'P4INSTROOT') + addPathIfNotExists(environ, 'PATH', val) + except SCons.Util.RegError: + # Can't detect where Perforce is, hope the user has it set in the + # PATH. + pass def exists(env): return env.Detect('p4') |