diff -Nru update-manager-0.156.14.12/debian/changelog update-manager-0.156.14.13/debian/changelog --- update-manager-0.156.14.12/debian/changelog 2014-03-10 17:54:56.000000000 +0000 +++ update-manager-0.156.14.13/debian/changelog 2014-04-11 21:43:37.000000000 +0000 @@ -1,3 +1,10 @@ +update-manager (1:0.156.14.13) precise-proposed; urgency=medium + + * debian/source_update-manager.py: use root_command_output so that we can + collect apt-clone_system_state.tar.gz. (LP: #1274704) + + -- Brian Murray Fri, 11 Apr 2014 14:42:25 -0700 + update-manager (1:0.156.14.12) precise-proposed; urgency=medium * debian/source_update-manager.py: create a DuplicateSignature by diff -Nru update-manager-0.156.14.12/debian/source_update-manager.py update-manager-0.156.14.13/debian/source_update-manager.py --- update-manager-0.156.14.12/debian/source_update-manager.py 2014-03-10 17:40:26.000000000 +0000 +++ update-manager-0.156.14.13/debian/source_update-manager.py 2014-04-11 21:40:30.000000000 +0000 @@ -4,10 +4,12 @@ Author: Brian Murray ''' +import os import re from apport.hookutils import ( attach_gsettings_package, attach_root_command_outputs, - attach_file_if_exists, recent_syslog) + attach_file_if_exists, recent_syslog, + root_command_output) def add_info(report, ui): @@ -30,9 +32,10 @@ if response: report.setdefault('Tags', 'dist-upgrade') report['Tags'] += ' dist-upgrade' - attach_file_if_exists(report, - '/var/log/dist-upgrade/apt-clone_system_state.tar.gz', - 'VarLogDistupgradeAptclonesystemstate.tar.gz') + clone_file = '/var/log/dist-upgrade/apt-clone_system_state.tar.gz' + if os.path.exists(clone_file): + report['VarLogDistupgradeAptclonesystemstate.tar.gz'] = \ + root_command_output(["cat", clone_file]) attach_file_if_exists(report, '/var/log/dist-upgrade/apt.log', 'VarLogDistupgradeAptlog') attach_file_if_exists(report, '/var/log/dist-upgrade/apt-term.log',