Merge lp:~cjwatson/bzr-builddeb/missing-format into lp:bzr-builddeb

Proposed by Colin Watson
Status: Merged
Merged at revision: not available
Proposed branch: lp:~cjwatson/bzr-builddeb/missing-format
Merge into: lp:bzr-builddeb
Diff against target: 12 lines (+1/-1)
1 file modified
import_dsc.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/bzr-builddeb/missing-format
Reviewer Review Type Date Requested Status
Jelmer Vernooij code Approve
Review via email: mp+21437@code.launchpad.net

Description of the change

Treat missing Format field as 1.0.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'import_dsc.py'
--- import_dsc.py 2010-03-01 08:23:33 +0000
+++ import_dsc.py 2010-03-16 10:49:18 +0000
@@ -1235,7 +1235,7 @@
1235 base_path = osutils.dirname(dsc_filename)1235 base_path = osutils.dirname(dsc_filename)
1236 dsc = deb822.Dsc(open(dsc_filename).read())1236 dsc = deb822.Dsc(open(dsc_filename).read())
1237 version = Version(dsc['Version'])1237 version = Version(dsc['Version'])
1238 format = dsc['Format'].strip()1238 format = dsc.get('Format', '1.0').strip()
1239 extractor_cls = SOURCE_EXTRACTORS.get(format)1239 extractor_cls = SOURCE_EXTRACTORS.get(format)
1240 if extractor_cls is None:1240 if extractor_cls is None:
1241 raise AssertionError("Don't know how to import source format %s yet"1241 raise AssertionError("Don't know how to import source format %s yet"

Subscribers

People subscribed via source and target branches