← Back to branch summary

~maxb/debian/lenny/bzr/backport

« back to all changes in this revision

Viewing changes to debian/patches/06_format_gc_chk_sha1_record

  • Committer: Jelmer Vernooij
  • Date: 2011-02-26 03:12:07 UTC
  • Revision ID: jelmer@samba.org-20110226031207-teqn24kt0qaju818
* Support running the test suite in parallel.
* Run selftest with -v so there is some indication of progress. This should
  prevent builds from being killed on buildds due to a lack of output.
* Cherry-pick fix to use correct format character for unsigned int
  gc_chk_sha1_record members. Fixes FTBFS on alpha.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_format_gc_chk_sha1_record
 
1
=== modified file 'bzrlib/_btree_serializer_pyx.pyx'
 
2
--- old/bzrlib/_btree_serializer_pyx.pyx        2010-08-24 19:21:32 +0000
 
3
+++ new/bzrlib/_btree_serializer_pyx.pyx        2011-02-25 18:52:53 +0000
 
4
@@ -513,12 +513,12 @@
 
5
         # %llu is what we really want, but unfortunately it was only added
 
6
         # in python 2.7... :(
 
7
         block_offset_str = str(record.block_offset)
 
8
-        value = PyString_FromFormat('%s %lu %lu %lu',
 
9
+        value = PyString_FromFormat('%s %u %u %u',
 
10
                                 PyString_AS_STRING(block_offset_str),
 
11
                                 record.block_length,
 
12
                                 record.record_start, record.record_end)
 
13
     else:
 
14
-        value = PyString_FromFormat('%lu %lu %lu %lu',
 
15
+        value = PyString_FromFormat('%lu %u %u %u',
 
16
                                     <unsigned long>record.block_offset,
 
17
                                     record.block_length,
 
18
                                     record.record_start, record.record_end)
 
19