diff options
Diffstat (limited to 'git_config.py')
-rw-r--r-- | git_config.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git_config.py b/git_config.py index 8311d9f0..8cc52dab 100644 --- a/git_config.py +++ b/git_config.py | |||
@@ -75,7 +75,7 @@ def _key(name): | |||
75 | parts = name.split('.') | 75 | parts = name.split('.') |
76 | if len(parts) < 2: | 76 | if len(parts) < 2: |
77 | return name.lower() | 77 | return name.lower() |
78 | parts[ 0] = parts[ 0].lower() | 78 | parts[0] = parts[0].lower() |
79 | parts[-1] = parts[-1].lower() | 79 | parts[-1] = parts[-1].lower() |
80 | return '.'.join(parts) | 80 | return '.'.join(parts) |
81 | 81 | ||
@@ -430,7 +430,7 @@ def _open_ssh(host, port=None): | |||
430 | 430 | ||
431 | # We will make two calls to ssh; this is the common part of both calls. | 431 | # We will make two calls to ssh; this is the common part of both calls. |
432 | command_base = ['ssh', | 432 | command_base = ['ssh', |
433 | '-o','ControlPath %s' % ssh_sock(), | 433 | '-o', 'ControlPath %s' % ssh_sock(), |
434 | host] | 434 | host] |
435 | if port is not None: | 435 | if port is not None: |
436 | command_base[1:1] = ['-p', str(port)] | 436 | command_base[1:1] = ['-p', str(port)] |
@@ -439,13 +439,13 @@ def _open_ssh(host, port=None): | |||
439 | # ...but before actually starting a master, we'll double-check. This can | 439 | # ...but before actually starting a master, we'll double-check. This can |
440 | # be important because we can't tell that that 'git@myhost.com' is the same | 440 | # be important because we can't tell that that 'git@myhost.com' is the same |
441 | # as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file. | 441 | # as 'myhost.com' where "User git" is setup in the user's ~/.ssh/config file. |
442 | check_command = command_base + ['-O','check'] | 442 | check_command = command_base + ['-O', 'check'] |
443 | try: | 443 | try: |
444 | Trace(': %s', ' '.join(check_command)) | 444 | Trace(': %s', ' '.join(check_command)) |
445 | check_process = subprocess.Popen(check_command, | 445 | check_process = subprocess.Popen(check_command, |
446 | stdout=subprocess.PIPE, | 446 | stdout=subprocess.PIPE, |
447 | stderr=subprocess.PIPE) | 447 | stderr=subprocess.PIPE) |
448 | check_process.communicate() # read output, but ignore it... | 448 | check_process.communicate() # read output, but ignore it... |
449 | isnt_running = check_process.wait() | 449 | isnt_running = check_process.wait() |
450 | 450 | ||
451 | if not isnt_running: | 451 | if not isnt_running: |
@@ -467,7 +467,7 @@ def _open_ssh(host, port=None): | |||
467 | except Exception as e: | 467 | except Exception as e: |
468 | _ssh_master = False | 468 | _ssh_master = False |
469 | print('\nwarn: cannot enable ssh control master for %s:%s\n%s' | 469 | print('\nwarn: cannot enable ssh control master for %s:%s\n%s' |
470 | % (host,port, str(e)), file=sys.stderr) | 470 | % (host, port, str(e)), file=sys.stderr) |
471 | return False | 471 | return False |
472 | 472 | ||
473 | time.sleep(1) | 473 | time.sleep(1) |