Package: lintian-brush
Version: 0.104

Hi,
while debugging another issue in the lintian-brush autopkgtests I've seen
this issue:

Next I've seen that with python3-breezy 3.2 that is in unstable you get
Traceback (most recent call last):
  File 
"/tmp/autopkgtest.tAETVe/build.tjd/src/lintian_brush/tests/test_patches.py",
line 299, in test_upstream_branch
    with upstream_with_applied_patches(self.tree, patches) as t:
  File "/usr/lib/python3.9/contextlib.py", line 117, in __enter__
    return next(self.gen)
  File "/tmp/autopkgtest.tAETVe/build.tjd/src/lintian_brush/patches.py",
line 193, in upstream_with_applied_patches
    with AppliedPatches(upstream_tree, patches) as tree:
  File "/tmp/autopkgtest.tAETVe/build.tjd/src/lintian_brush/patches.py",
line 133, in __enter__
    from breezy.transform import TransformPreview
ImportError: cannot import name 'TransformPreview' from
'breezy.transform'
(/usr/lib/python3/dist-packages/breezy/transform.py)

I've found that this is from the new:
  breezy     | 3.2.0+bzr7542-1        | unstable                | source

You can switch in/out that state by switching back to
  breezy     | 3.1.0-8                | testing                 | source

It seems this was split from
breezy/transform.py:1971:class TransformPreview(DiskTreeTransform):
Into:
breezy/git/transform.py:1520:class GitTransformPreview(GitTreeTransform):
breezy/bzr/transform.py:1860:class TransformPreview(InventoryTreeTransform):

The following fixes this for me in a local autopkgtest VM run:

--- lintian-brush-0.104/lintian_brush/patches.py 2021-03-29
19:56:27.000000000 +0200
+++ lintian-brush-0.104/lintian_brush/patches.py 2021-03-29
19:56:27.000000000 +0200
@@ -130,7 +130,7 @@

     def __enter__(self):
         if self.patches:
-            from breezy.transform import TransformPreview
+            from breezy.bzr.transform import TransformPreview

             self._tt = TransformPreview(self.tree)
             apply_patches(self._tt, self.patches, prefix=self.prefix)

I don't know if you eventually want a version dependent switch for the import,
but that should get you going and since I was not finding a bug for it yet I
thought filing this for awareness might help in any case.

-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd

Reply via email to