← Back to branch summary

~mvo/update-manager/hwe-support-status-ui

« back to all changes in this revision

Viewing changes to debian/source_update-manager.py

  • Committer: Michael Vogt
  • Date: 2014-06-10 11:16:45 UTC
  • Revision ID: michael.vogt@ubuntu.com-20140610111645-e9j99q4cb4o16bfk
merged 1:0.156.14.13 upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/source_update-manager.py
4
4
Author: Brian Murray <brian@ubuntu.com>
5
5
'''
6
6
 
 
7
import os
7
8
import re
8
9
from apport.hookutils import (
9
10
    attach_gsettings_package, attach_root_command_outputs,
10
 
    attach_file_if_exists, recent_syslog)
 
11
    attach_file_if_exists, recent_syslog,
 
12
    root_command_output)
11
13
 
12
14
 
13
15
def add_info(report, ui):
30
32
    if response:
31
33
        report.setdefault('Tags', 'dist-upgrade')
32
34
        report['Tags'] += ' dist-upgrade'
33
 
        attach_file_if_exists(report,
34
 
            '/var/log/dist-upgrade/apt-clone_system_state.tar.gz',
35
 
            'VarLogDistupgradeAptclonesystemstate.tar.gz')
 
35
        clone_file = '/var/log/dist-upgrade/apt-clone_system_state.tar.gz'
 
36
        if os.path.exists(clone_file):
 
37
            report['VarLogDistupgradeAptclonesystemstate.tar.gz'] =  \
 
38
                root_command_output(["cat", clone_file])
36
39
        attach_file_if_exists(report, '/var/log/dist-upgrade/apt.log',
37
40
            'VarLogDistupgradeAptlog')
38
41
        attach_file_if_exists(report, '/var/log/dist-upgrade/apt-term.log',