/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 apport/source_brz.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
apport/source_brz.py
8
8
import os
9
9
 
10
10
brz_log = os.path.expanduser('~/.brz.log')
11
 
dot_brz = os.path.expanduser('~/.config/breezy')
 
11
dot_brz = os.path.expanduser('~/.bazaar')
12
12
 
13
13
def _add_log_tail(report):
14
14
    # may have already been added in-process
24
24
        if line == '\n':
25
25
            blanks += 1
26
26
        brz_log_tail.append(line)
27
 
        if blanks >= 2:
 
27
        if blanks >= 2: 
28
28
            break
29
29
 
30
30
    brz_log_tail.reverse()
36
36
    if 'BrzPlugins' not in report:
37
37
        # may already be present in-process
38
38
        report['BrzPlugins'] = command_output(['brz', 'plugins', '-v'])
39
 
 
 
39
        
40
40
    # by default assume brz crashes are upstream bugs; this relies on
41
41
    # having a brz entry under /etc/apport/crashdb.conf.d/
42
42
    report['CrashDB'] = 'brz'
45
45
    # TODO: strip that out and attach the rest
46
46
 
47
47
    #attach_file_if_exists(report,
48
 
    #   os.path.join(dot_brz, 'breezy.conf', 'BrzConfig')
 
48
    #   os.path.join(dot_brz, 'bazaar.conf', 'BrzConfig')
49
49
    #attach_file_if_exists(report,
50
50
    #   os.path.join(dot_brz, 'locations.conf', 'BrzLocations')
51
51
 
52
 
 
 
52
        
53
53
# vim: expandtab shiftwidth=4