unversioned executability issue, perhaps in builddeb
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-builddeb |
Fix Released
|
High
|
Unassigned |
Bug Description
Trying to do bzr merge-upstream, I got this:
bzr: ERROR: Tree transform is malformed [('unversioned executability', 'new-130')]
Mon 2010-05-31 14:33:49 -0700
0.023 bazaar version: 2.1.1
0.023 bzr arguments: [u'merge-upstream', u'../pandora-
0.032 looking for plugins in /home/mordred/
0.105 looking for plugins in /usr/lib/
0.106 Plugin name builddeb already loaded
0.140 encoding stdout as sys.stdout encoding 'UTF-8'
0.157 opening working tree '/home/
0.193 Using 'debian/changelog' to get package information
[19833] 2010-05-31 14:33:49.792 INFO: Using distribution unstable
0.199 Using .. for orig-dir, taken from /home/mordred/
0.214 opening working tree '/home/
0.229 creating branch <bzrlib.
0.262 created new branch BzrBranch7(
0.271 trying to create missing lock '/home/
0.271 opening working tree '/home/
0.379 opening working tree '/home/
0.400 Importing upstream version 0.131.6 from /tmp/tmpRg_1WZ with parents ['<email address hidden>']
0.668 Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run_
File "/usr/lib/
return self._operation
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/home/
merge_
File "/home/
upstream_
File "/home/
file_
File "/home/
import_
File "/home/
for conflict in cook_conflicts(
File "/usr/lib/
raise MalformedTransf
MalformedTransform: Tree transform is malformed [('unversioned executability', 'new-130')]
0.669 Transferred: 0KiB (0.0K/s r:0K w:0K)
0.669 return code 3
Related branches
- Bzr-builddeb-hackers: Pending requested
-
Diff: 268 lines (+183/-27)4 files modifiedbzrtools_import.py (+32/-21)
debian/changelog (+7/-0)
dh_make.py (+10/-1)
tests/blackbox/test_merge_upstream.py (+134/-5)
- James Westby: Approve
-
Diff: 473 lines (+64/-53)7 files modifiedbuilder.py (+5/-5)
changes.py (+1/-1)
cmds.py (+19/-19)
directory.py (+5/-5)
hooks.py (+2/-2)
import_dsc.py (+16/-5)
upstream.py (+16/-16)
Changed in bzr-builddeb: | |
status: | Triaged → Fix Committed |
Changed in bzr-builddeb: | |
status: | Fix Committed → Fix Released |
From some experimenting, I was able to isolate this cause for me:
<mtaylor> lifeless: I figured out the cause at least - in the tree I had moved a file, license.py, to internal/ licensing. py and then added a new file called license.py licesnsing. py and modifying license.py with the new contents - all worked fine
<mtaylor> lifeless: this caused merge upstream to become confused
<mtaylor> lifeless: if I re-expressed that in the upstream bzr tree as adding a new file internal/
So I'm guessing it has to do with move/rename tracking and tarball importing perhaps.