Hi ubuntu-sru,
Attached is my proposed patch for the SRU on this issue. Please
let me know if I missed anything.
Thanks,
James
** Description changed:
+ Impact: Prevents some branches from being checked out over bzr+ssh://
+
+ Fix in intrepid: the bug was fixed upstream in 1.4, intrepid has 1.5
+ already.
+
+ TEST CASE:
+
+ * Run "bzr checkout bzr+ssh://<your lp
id>@bazaar.launchpad.net/~planet-ubuntu/config/main"
+ * Get a python traceback like the one shown below.
+
+ * Update the the fixed version
+ * Run the same command again, it completes without error and you have a
checkout in the directory "main".
+
+ Regression potential: low, the branches that are affected by this have a
problem with the data
+ caused by an old version of bzr. Only these branches should trigger the
special case handling.
+ Any that fail within the special case are another bug, but wouldn't have
succeeded without
+ the patch either.
+
+ ===== Original report:
+
Performing the following action:
bzr checkout bzr+ssh://[EMAIL PROTECTED]/~planet-
ubuntu/config/main planet-ubuntu
Results in:
bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit <bzrlib.knit.KnitGraphIndex
object at 0x86e1e2c> corrupt: attempt to add line-delta in non-delta
knit
Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 834, in
run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 790, in
run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in
run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1012, in
run
accelerator_tree, hardlink)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 766, in
create_checkout
checkout_branch.pull(self, stop_revision=revision_id)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1714, in pull
run_hooks=run_hooks)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1513, in pull
self.update_revisions(source, stop_revision, overwrite=overwrite)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1465, in
update_revisions
self.fetch(other, stop_revision)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 266, in fetch
pb=nested_pb)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 949, in
fetch
return inter.fetch(revision_id=revision_id, pb=pb,
find_ghosts=find_ghosts)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2963, in
fetch
pb=pb, find_ghosts=find_ghosts)
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 109, in
__init__
self.__fetch()
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 139, in
__fetch
self._fetch_everything_for_search(search, pp)
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 418, in
_fetch_everything_for_search
self.to_repository.insert_data_stream(data_stream)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 860, in
insert_data_stream
(format, data_list, reader_func))
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 850, in
insert_data_stream
reader_callable(length))
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 604, in
_add_raw_records
self._index.add_versions(index_entries)
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1997, in
add_versions
raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
KnitCorrupt: Knit <bzrlib.knit.KnitGraphIndex object at 0x86e1e2c> corrupt:
attempt to add line-delta in non-delta knit
bzr 1.3.1 on python 2.5.2.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'checkout', 'bzr+ssh://[EMAIL
PROTECTED]/~planet-ubuntu/config/main', 'planet-ubuntu']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bzrtools
/usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.3.0]
gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk
[0.93.0]
launchpad
/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
*** Bazaar has encountered an internal error.
Please report a bug at https://bugs.launchpad.net/bzr/+filebug
including this traceback, and a description of what you
were doing when the error occurred.
** Description changed:
Impact: Prevents some branches from being checked out over bzr+ssh://
Fix in intrepid: the bug was fixed upstream in 1.4, intrepid has 1.5
already.
TEST CASE:
* Run "bzr checkout bzr+ssh://<your lp
id>@bazaar.launchpad.net/~planet-ubuntu/config/main"
* Get a python traceback like the one shown below.
+ * (Remove the broken branch in "main/")
* Update the the fixed version
* Run the same command again, it completes without error and you have a
checkout in the directory "main".
Regression potential: low, the branches that are affected by this have a
problem with the data
caused by an old version of bzr. Only these branches should trigger the
special case handling.
Any that fail within the special case are another bug, but wouldn't have
succeeded without
the patch either.
===== Original report:
Performing the following action:
bzr checkout bzr+ssh://[EMAIL PROTECTED]/~planet-
ubuntu/config/main planet-ubuntu
Results in:
bzr: ERROR: bzrlib.errors.KnitCorrupt: Knit <bzrlib.knit.KnitGraphIndex
object at 0x86e1e2c> corrupt: attempt to add line-delta in non-delta
knit
Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 834, in
run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 790, in
run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in
run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1012, in
run
accelerator_tree, hardlink)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 766, in
create_checkout
checkout_branch.pull(self, stop_revision=revision_id)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1714, in pull
run_hooks=run_hooks)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1513, in pull
self.update_revisions(source, stop_revision, overwrite=overwrite)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 1465, in
update_revisions
self.fetch(other, stop_revision)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 266, in fetch
pb=nested_pb)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 949, in
fetch
return inter.fetch(revision_id=revision_id, pb=pb,
find_ghosts=find_ghosts)
File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in
write_locked
return unbound(self, *args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2963, in
fetch
pb=pb, find_ghosts=find_ghosts)
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 109, in
__init__
self.__fetch()
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 139, in
__fetch
self._fetch_everything_for_search(search, pp)
File "/usr/lib/python2.5/site-packages/bzrlib/fetch.py", line 418, in
_fetch_everything_for_search
self.to_repository.insert_data_stream(data_stream)
File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 860, in
insert_data_stream
(format, data_list, reader_func))
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 850, in
insert_data_stream
reader_callable(length))
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 604, in
_add_raw_records
self._index.add_versions(index_entries)
File "/usr/lib/python2.5/site-packages/bzrlib/knit.py", line 1997, in
add_versions
raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
KnitCorrupt: Knit <bzrlib.knit.KnitGraphIndex object at 0x86e1e2c> corrupt:
attempt to add line-delta in non-delta knit
bzr 1.3.1 on python 2.5.2.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'checkout', 'bzr+ssh://[EMAIL
PROTECTED]/~planet-ubuntu/config/main', 'planet-ubuntu']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bzrtools
/usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.3.0]
gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk
[0.93.0]
launchpad
/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
*** Bazaar has encountered an internal error.
Please report a bug at https://bugs.launchpad.net/bzr/+filebug
including this traceback, and a description of what you
were doing when the error occurred.
** Attachment added: "bzr_1.3.1-1ubuntu0.1.diff"
http://launchpadlibrarian.net/14801498/bzr_1.3.1-1ubuntu0.1.diff
--
ERROR: bzrlib.errors.KnitCorrupt: Knit <bzrlib.knit.KnitGraphIndex object at
0x86e1e2c> corrupt: attempt to add line-delta in non-delta knit
https://bugs.launchpad.net/bugs/230294
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
