On Thu, Jul 18, 2024 at 02:08:32PM +0200, Hans-Christoph Steiner wrote:
> It is fixed upstream:
> https://github.com/buildbot/buildbot/commit/291df50dc3f27adb47a001fc154cf4c55490687e

Thanks.

I was going to try to work on this bug, but I found that `gbp pq import`
in the current repository doesn't work:

  $ gbp pq import
  gbp:info: Trying to apply patches at 
'167d745605609dd91521749db28ad396a1099eaa'
  gbp:warning: Patch 'remove-future' has no authorship information, using 
'Debian Python Team <team+pyt...@tracker.debian.org>'
  gbp:warning: Patch remove-future failed to apply, retrying with whitespace 
fixup
  gbp:error: Failed to apply 
'/home/cjwatson/src/debian/python-modules/python-modules/buildbot/debian/patches/remove-future':
 Error running git apply: error: patch failed: 
worker/buildbot_worker/pbutil.py:154
  error: worker/buildbot_worker/pbutil.py: patch does not apply
  error: patch failed: worker/buildbot_worker/runprocess.py:345
  error: worker/buildbot_worker/runprocess.py: patch does not apply
  gbp:error: Couldn't apply patches

And then I noticed that Alexandre committed a new upstream release to
the repository two months ago, but didn't upload it, and it's in this
broken state so I don't know what to do with it.  Alexandre, can you
comment, and ideally fix it up?

(I try to avoid leaving unreleased new-upstream-version commits in
debian/master branches for so long.  It makes it quite unclear for other
developers what state things are in and what they can do - or at least
it does for me.)

Thanks,

-- 
Colin Watson (he/him)                              [cjwat...@debian.org]

Reply via email to