← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ubuntu-release-upgrader/utopic-proposed

« back to all changes in this revision

Viewing changes to DistUpgrade/DistUpgradeApport.py

  • Committer: Package Import Robot
  • Author(s): Brian Murray
  • Date: 2014-03-18 11:14:54 UTC
  • Revision ID: package-import@ubuntu.com-20140318111454-phy53svg5hthtnfm
Tags: 1:0.218
DistUpgrade/DistUpgradeApport.py: for crashes in the release upgrader
tarball set the package version to the one from the tarball i.e.
DistUpgradeVersion.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
DistUpgrade/DistUpgradeApport.py
48
48
    except ImportError as e:
49
49
        logging.error("failed to import apport python module, can't generate crash: %s" % e)
50
50
        return False
 
51
    from .DistUpgradeVersion import VERSION
51
52
    # we pretend we are do-release-upgrade
52
53
    sys.argv[0] = "/usr/bin/do-release-upgrade"
53
54
    apport_excepthook(type, value, tb)
55
56
    if os.path.exists('/var/crash/_usr_bin_do-release-upgrade.0.crash'):
56
57
        report = Report()
57
58
        report.setdefault('Tags', 'dist-upgrade')
58
 
        report['Tags'] += ' dist-upgrade'
 
59
        # use the version of the release-upgrader tarball, not the installed
 
60
        # package
 
61
        report.setdefault('Package', 'ubuntu-release-upgrader-core 1:%s' %
 
62
                          VERSION)
59
63
        _apport_append_logfiles(report)
60
64
        report.add_to_existing('/var/crash/_usr_bin_do-release-upgrade.0.crash')
61
65
    return True