Merge lp:~maxb/bzr-builddeb/lzma-tar-length-fix into lp:bzr-builddeb

Proposed by Max Bowsher
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 606
Merged at revision: 607
Proposed branch: lp:~maxb/bzr-builddeb/lzma-tar-length-fix
Merge into: lp:bzr-builddeb
Diff against target: 25 lines (+15/-0)
1 file modified
tests/test_import_dsc.py (+15/-0)
To merge this branch: bzr merge lp:~maxb/bzr-builddeb/lzma-tar-length-fix
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+72293@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py 2011-07-25 13:11:01 +0000
+++ tests/test_import_dsc.py 2011-08-20 12:50:23 +0000
@@ -904,6 +904,21 @@
904 os.mkdir(basedir)904 os.mkdir(basedir)
905 write_to_file(os.path.join(basedir, "README"), "Hi\n")905 write_to_file(os.path.join(basedir, "README"), "Hi\n")
906 write_to_file(os.path.join(basedir, "BUGS"), "")906 write_to_file(os.path.join(basedir, "BUGS"), "")
907 # Some versions of tar, including that in Ubuntu lucid and maverick,
908 # but not natty and later, have a bug which prevents them from
909 # autodetecting the compression type of files less than 512 bytes in
910 # length. So, add some extra verbiage to push us just above that
911 # boundary. This matters for lzma, but not gz and bz2, because
912 # pristine-tar has its own decompression support for those.
913 write_to_file(os.path.join(basedir, "LOREM"),
914 "Lorem ipsum dolor sit amet, consectetur adipisicing elit, "
915 "sed do eiusmod tempor incididunt ut labore et dolore magna "
916 "aliqua. Ut enim ad minim veniam, quis nostrud exercitation "
917 "ullamco laboris nisi ut aliquip ex ea commodo consequat. "
918 "Duis aute irure dolor in reprehenderit in voluptate velit "
919 "esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
920 "occaecat cupidatat non proident, sunt in culpa qui officia "
921 "deserunt mollit anim id est laborum.")
907 tar_path = "package_0.1.orig.tar.lzma"922 tar_path = "package_0.1.orig.tar.lzma"
908 f = lzma.LZMAFile(tar_path, 'w')923 f = lzma.LZMAFile(tar_path, 'w')
909 try:924 try:

Subscribers

People subscribed via source and target branches