Bug#1030093: dgit: can't import python-coverage.

2023-02-04 Thread Ian Jackson
Ian Jackson writes ("Re: Bug#1030093: dgit: can't import python-coverage."):
> (Also probably gbp pq ought to cope natively, so I will file a bug
> about that.).

This is now
  #1030534: gbp pq import fails with series file containing form feed

-- 
Ian JacksonThese opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.



Bug#1030093: dgit: can't import python-coverage.

2023-02-04 Thread Ian Jackson
Severity: control -1 serious

Hi, thanks for the report!

Peter Green writes ("Bug#1030093: dgit: can't import python-coverage."):
> dgit: trying slow absurd-git-apply...
> Traceback (most recent call last):
>File "/usr/bin/gbp", line 149, in 
...
> IsADirectoryError: [Errno 21] Is a directory: 
> '/home/plugwash/dgittest/repo/.git/dgit/unpack/python-coverage-6.5.0+dfsg1/debian/patches/'
> gbp pq import failed: subprocess failed with error exit status 1

How sad.

> I noticed as weird character which mcedit shows as "^L" in 
> debian/patches/series, perhaps this is related.

I have investigated.  You are right that this is the root cause.
I think this is a deranged to do but dgit ought to be able to import
everything.

I have what I think is a fix - well, a workaround which makes the
absurd gitapply contraption even more nightmarish - which I will
upload soon.

(Also probably gbp pq ought to cope natively, so I will file a bug
about that.).

Ian.

-- 
Ian JacksonThese opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.



Bug#1030093: dgit: can't import python-coverage.

2023-01-30 Thread Peter Green

Package: dgit

mkdir dgittest
cd dgittest
dget -d 
http://deb.debian.org/debian/pool/main/p/python-coverage/python-coverage_6.5.0+dfsg1-2.dsc
mkdir repo
cd repo
git init
dgit import-dsc ../python-coverage_6.5.0+dfsg1-2.dsc +workingbranch

Dgit metadata in .dsc: NO git hash
using existing python-coverage_6.5.0+dfsg1.orig.tar.xz
using existing python-coverage_6.5.0+dfsg1-2.debian.tar.xz
dpkg-source: info: extracting python-coverage in python-coverage-6.5.0+dfsg1
dpkg-source: info: unpacking python-coverage_6.5.0+dfsg1.orig.tar.xz
dpkg-source: info: unpacking python-coverage_6.5.0+dfsg1-2.debian.tar.xz
warning: gbp pq import failed: subprocess failed with error exit status 1
dgit: trying slow absurd-git-apply...
Traceback (most recent call last):
  File "/usr/bin/gbp", line 149, in 
sys.exit(supercommand())
  File "/usr/bin/gbp", line 145, in supercommand
return module.main(args)
  File "/usr/lib/python3/dist-packages/gbp/scripts/pq.py", line 488, in main
import_pq(repo, current, options)
  File "/usr/lib/python3/dist-packages/gbp/scripts/pq.py", line 374, in 
import_pq
options.upstream_tag)
  File "/usr/lib/python3/dist-packages/gbp/scripts/pq.py", line 335, in 
import_quilt_patches
apply_and_commit_patch(repo, patch, maintainer, patch.topic, name)
  File "/usr/lib/python3/dist-packages/gbp/scripts/common/pq.py", line 313, in 
apply_and_commit_patch
author = {'name': patch.author,
  File "/usr/lib/python3/dist-packages/gbp/patch_series.py", line 181, in author
return self._get_info_field('author')
  File "/usr/lib/python3/dist-packages/gbp/patch_series.py", line 164, in 
_get_info_field
self._read_info()
  File "/usr/lib/python3/dist-packages/gbp/patch_series.py", line 196, in 
_read_info
super(Dep3Patch, self)._read_info()
  File "/usr/lib/python3/dist-packages/gbp/patch_series.py", line 62, in 
_read_info
self._read_git_mailinfo()
  File "/usr/lib/python3/dist-packages/gbp/patch_series.py", line 81, in 
_read_git_mailinfo
for line in open(self.path, 'rb'):
IsADirectoryError: [Errno 21] Is a directory: 
'/home/plugwash/dgittest/repo/.git/dgit/unpack/python-coverage-6.5.0+dfsg1/debian/patches/'
gbp pq import failed: subprocess failed with error exit status 1

I noticed as weird character which mcedit shows as "^L" in 
debian/patches/series, perhaps this is related.

Tested both on my somewhat outdated laptop, and in an up to date sid chroot.