Launchpad itself

Merge lp:~julian-edwards/launchpad/metadata-fix2-bug-595038 into lp:launchpad

  1. metadata-fix2-bug-595038
  2. Merge into devel
Proposed by Julian Edwards
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 11063
Proposed branch: lp:~julian-edwards/launchpad/metadata-fix2-bug-595038
Merge into: lp:launchpad
Diff against target: 25 lines (+2/-2)
2 files modified
lib/lp/archiveuploader/nascentuploadfile.py (+1/-1)
lib/lp/archiveuploader/tests/meta-data-custom-files.txt (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/launchpad/metadata-fix2-bug-595038
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+28521@code.launchpad.net

Description of the change

When I did the previous fix for this bug, I forgot that all custom package
files must begin with "raw-" for them to work properly. That's fixed in this
trivial change.

It's already been QA'ed on dogfood and proven to work.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
2--- lib/lp/archiveuploader/nascentuploadfile.py 2010-06-16 11:21:11 +0000
3+++ lib/lp/archiveuploader/nascentuploadfile.py 2010-06-25 16:35:41 +0000
4@@ -260,7 +260,7 @@
5 'raw-ddtp-tarball': PackageUploadCustomFormat.DDTP_TARBALL,
6 'raw-translations-static':
7 PackageUploadCustomFormat.STATIC_TRANSLATIONS,
8- 'meta-data' :
9+ 'raw-meta-data' :
10 PackageUploadCustomFormat.META_DATA,
11 }
12
13
14=== modified file 'lib/lp/archiveuploader/tests/meta-data-custom-files.txt'
15--- lib/lp/archiveuploader/tests/meta-data-custom-files.txt 2010-06-16 11:30:09 +0000
16+++ lib/lp/archiveuploader/tests/meta-data-custom-files.txt 2010-06-25 16:35:41 +0000
17@@ -14,7 +14,7 @@
18 >>> from lp.archiveuploader.nascentuploadfile import CustomUploadFile
19 >>> custom_upload_file = CustomUploadFile(
20 ... filepath="", digest="", size=1, priority_name="", policy=None,
21- ... component_and_section="main/meta-data", logger=None)
22+ ... component_and_section="main/raw-meta-data", logger=None)
23
24 >>> print custom_upload_file.custom_type.name
25 META_DATA