diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-04-04 19:02:07 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2009-04-04 19:02:07 +0200 |
| commit | abe7de464b46fae48c8d677f5438317448fc1c29 (patch) | |
| tree | 37fd35a62c058fe27a9193604d262399684b63ca /gbp | |
| parent | 74a09541157608fb12d37a41fe926ee12bfa6139 (diff) | |
| download | git-buildpackage-abe7de464b46fae48c8d677f5438317448fc1c29.tar.gz git-buildpackage-abe7de464b46fae48c8d677f5438317448fc1c29.tar.bz2 git-buildpackage-abe7de464b46fae48c8d677f5438317448fc1c29.zip | |
store version without epoch
and simplify version parsing
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/deb_utils.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gbp/deb_utils.py b/gbp/deb_utils.py index 8cebd7fa..b586aabb 100644 --- a/gbp/deb_utils.py +++ b/gbp/deb_utils.py @@ -107,7 +107,15 @@ def parse_dsc(dscfile): def parse_changelog(changelog): - """parse changelog file changelog""" + """ + parse changelog file changelog + + cp['Version']: full version string including epoch + cp['Upstream-Version']: upstream version, if not debian native + cp['Debian-Version']: debian release + cp['Epoch']: epoch, if any + cp['NoEpoch-Version']: full version string excluding epoch + """ if not os.access(changelog, os.F_OK): raise NoChangelogError, "Changelog %s not found" % (changelog, ) status, output = commands.getstatusoutput('dpkg-parsechangelog -l%s' % (changelog, )) @@ -115,14 +123,14 @@ def parse_changelog(changelog): raise ParseChangeLogError, output cp = email.message_from_string(output) try: - if '-' in cp['Version']: - upstream_version, cp['Debian-Version'] = cp['Version'].rsplit('-', 1) - if ':' in upstream_version: - cp['Epoch'], cp['Upstream-Version'] = upstream_version.split(':', 1) - else: - cp['Upstream-Version'] = upstream_version + if ':' in cp['Version']: + cp['Epoch'], cp['NoEpoch-Version'] = cp['Version'].split(':', 1) + else: + cp['NoEpoch-Version'] = cp['Version'] + if '-' in cp['NoEpoch-Version']: + cp['Upstream-Version'], cp['Debian-Version'] = cp['NoEpoch-Version'].rsplit('-', 1) else: - cp['Debian-Version'] = cp['Version'] + cp['Debian-Version'] = cp['NoEpoch-Version'] except TypeError: raise ParseChangeLogError, output.split('\n')[0] return cp |