/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-18 18:57:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1868.
  • Revision ID: john@arbash-meinel.com-20060718185754-4007745748e28db9
Commit timestamp restricted to 1ms precision.

The old code would restrict to 1s resolution if the timestamp was
supplied, while it preserved full resolution if the timestamp was
auto generated. Now both paths preserve only 1ms resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005 by 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
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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(), """
25
20
import errno
26
21
import subprocess
27
22
 
28
 
from bzrlib import (
29
 
    errors,
30
 
    trace,
31
 
    ui,
32
 
    )
33
 
""")
34
 
 
 
23
import bzrlib.errors as errors
35
24
 
36
25
class DisabledGPGStrategy(object):
37
26
    """A GPG Strategy that makes everything fail."""
50
39
        """Real strategies take a configuration."""
51
40
 
52
41
    def sign(self, content):
53
 
        return ("-----BEGIN PSEUDO-SIGNED CONTENT-----\n" + content +
54
 
                "-----END PSEUDO-SIGNED CONTENT-----\n")
55
 
 
56
 
 
57
 
def _set_gpg_tty():
58
 
    tty = os.environ.get('TTY')
59
 
    if tty is not None:
60
 
        os.environ['GPG_TTY'] = tty
61
 
        trace.mutter('setting GPG_TTY=%s', tty)
62
 
    else:
63
 
        # This is not quite worthy of a warning, because some people
64
 
        # don't need GPG_TTY to be set. But it is worthy of a big mark
65
 
        # in ~/.bzr.log, so that people can debug it if it happens to them
66
 
        trace.mutter('** Env var TTY empty, cannot set GPG_TTY.'
67
 
                     '  Is TTY exported?')
 
42
        return content
68
43
 
69
44
 
70
45
class GPGStrategy(object):
71
46
    """GPG Signing and checking facilities."""
72
 
 
 
47
        
73
48
    def _command_line(self):
74
49
        return [self._config.gpg_signing_command(), '--clearsign']
75
50
 
77
52
        self._config = config
78
53
 
79
54
    def sign(self, content):
80
 
        if isinstance(content, unicode):
81
 
            raise errors.BzrBadParameterUnicode('content')
82
 
        ui.ui_factory.clear_term()
83
 
 
84
 
        preexec_fn = _set_gpg_tty
85
 
        if sys.platform == 'win32':
86
 
            # Win32 doesn't support preexec_fn, but wouldn't support TTY anyway.
87
 
            preexec_fn = None
88
55
        try:
89
56
            process = subprocess.Popen(self._command_line(),
90
57
                                       stdin=subprocess.PIPE,
91
 
                                       stdout=subprocess.PIPE,
92
 
                                       preexec_fn=preexec_fn)
 
58
                                       stdout=subprocess.PIPE)
93
59
            try:
94
60
                result = process.communicate(content)[0]
95
61
                if process.returncode is None: