← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-13 20:37:09 UTC
  • mto: This revision was merged to the branch mainline in revision 3001.
  • Revision ID: john@arbash-meinel.com-20071113203709-kysdte0emqv84pnj
https://launchpad.net/bugs/162486
Fix bug #162486, by having RemoteBranch properly initialize self._revision_id_to_revno_map.

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."""
39
50
        """Real strategies take a configuration."""
40
51
 
41
52
    def sign(self, content):
42
 
        return 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?')
43
68
 
44
69
 
45
70
class GPGStrategy(object):
52
77
        self._config = config
53
78
 
54
79
    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
55
88
        try:
56
89
            process = subprocess.Popen(self._command_line(),
57
90
                                       stdin=subprocess.PIPE,
58
 
                                       stdout=subprocess.PIPE)
 
91
                                       stdout=subprocess.PIPE,
 
92
                                       preexec_fn=preexec_fn)
59
93
            try:
60
94
                result = process.communicate(content)[0]
61
95
                if process.returncode is None: