Rev 5691: (gz) Fix test failure on alpha by correcting format string for in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Feb 28 21:14:30 UTC 2011


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5691 [merge]
revision-id: pqm at pqm.ubuntu.com-20110228211427-bwkkhj6817rkk9ym
parent: pqm at pqm.ubuntu.com-20110226154801-fpsu7s5i4pimis6t
parent: gzlist at googlemail.com-20110225185253-y0kplvee84n7pvgn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-02-28 21:14:27 +0000
message:
  (gz) Fix test failure on alpha by correcting format string for
   gc_chk_sha1_record (Martin [gz])
modified:
  bzrlib/_btree_serializer_pyx.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
=== modified file 'bzrlib/_btree_serializer_pyx.pyx'
--- a/bzrlib/_btree_serializer_pyx.pyx	2010-08-24 19:21:32 +0000
+++ b/bzrlib/_btree_serializer_pyx.pyx	2011-02-25 18:52:53 +0000
@@ -513,12 +513,12 @@
         # %llu is what we really want, but unfortunately it was only added
         # in python 2.7... :(
         block_offset_str = str(record.block_offset)
-        value = PyString_FromFormat('%s %lu %lu %lu',
+        value = PyString_FromFormat('%s %u %u %u',
                                 PyString_AS_STRING(block_offset_str),
                                 record.block_length,
                                 record.record_start, record.record_end)
     else:
-        value = PyString_FromFormat('%lu %lu %lu %lu',
+        value = PyString_FromFormat('%lu %u %u %u',
                                     <unsigned long>record.block_offset,
                                     record.block_length,
                                     record.record_start, record.record_end)




More information about the bazaar-commits mailing list