← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-02-01 23:48:08 UTC
  • mfrom: (2225.1.6 revert)
  • Revision ID: pqm@pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
Display changes made by revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
#   Authors: Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
17
17
 
18
18
"""GPG signing and checking logic."""
19
19
 
 
20
import os
 
21
import sys
 
22
 
 
23
from bzrlib.lazy_import import lazy_import
 
24
lazy_import(globals(), """
20
25
import errno
21
26
import subprocess
22
27
 
23
 
import bzrlib.errors as errors
 
28
from bzrlib import (
 
29
    errors,
 
30
    trace,
 
31
    ui,
 
32
    )
 
33
""")
 
34
 
24
35
 
25
36
class DisabledGPGStrategy(object):
26
37
    """A GPG Strategy that makes everything fail."""
42
53
        return content
43
54
 
44
55
 
 
56
def _set_gpg_tty():
 
57
    tty = os.environ.get('TTY')
 
58
    if tty is not None:
 
59
        os.environ['GPG_TTY'] = tty
 
60
        trace.mutter('setting GPG_TTY=%s', tty)
 
61
    else:
 
62
        # This is not quite worthy of a warning, because some people
 
63
        # don't need GPG_TTY to be set. But it is worthy of a big mark
 
64
        # in ~/.bzr.log, so that people can debug it if it happens to them
 
65
        trace.mutter('** Env var TTY empty, cannot set GPG_TTY.'
 
66
                     '  Is TTY exported?')
 
67
 
 
68
 
45
69
class GPGStrategy(object):
46
70
    """GPG Signing and checking facilities."""
47
71
        
52
76
        self._config = config
53
77
 
54
78
    def sign(self, content):
 
79
        ui.ui_factory.clear_term()
 
80
 
 
81
        preexec_fn = _set_gpg_tty
 
82
        if sys.platform == 'win32':
 
83
            # Win32 doesn't support preexec_fn, but wouldn't support TTY anyway.
 
84
            preexec_fn = None
55
85
        try:
56
86
            process = subprocess.Popen(self._command_line(),
57
87
                                       stdin=subprocess.PIPE,
58
 
                                       stdout=subprocess.PIPE)
 
88
                                       stdout=subprocess.PIPE,
 
89
                                       preexec_fn=preexec_fn)
59
90
            try:
60
91
                result = process.communicate(content)[0]
61
92
                if process.returncode is None: