Hi Dennis,
On Tue, Jan 25, 2022 at 06:14:44PM +0100, Dennis Filder wrote:
> Source: git-buildpackage
> Version: 0.9.22
> Severity: normal
>
> I tried to import an orig tarball while on the "upstream" branch and
> was met with this:
>
> $ git status
> On branch upstream
> Your branch is up to date with 'origin/upstream'.
>
> nothing to commit, working tree clean
> $ gbp import-orig ../origtarballs/*_?.?.??.orig.tar.xz
> git-buildpackage: exception:
> Traceback (most recent call last):
> File "/usr/lib/python3/dist-packages/gbp/scripts/import_orig.py", line
> 111, in detect_name_and_version
> cp = ChangeLog(filename='debian/changelog')
> File "/usr/lib/python3/dist-packages/gbp/deb/changelog.py", line 84, in
> __init__
> raise NoChangeLogError("Changelog %s not found" % (filename, ))
> gbp.deb.changelog.NoChangeLogError: Changelog debian/changelog not found
>
> During handling of the above exception, another exception occurred:
>
> Traceback (most recent call last):
> File "/usr/bin/gbp", line 149, in <module>
> sys.exit(supercommand())
> File "/usr/bin/gbp", line 145, in supercommand
> return module.main(args)
> File "/usr/lib/python3/dist-packages/gbp/scripts/import_orig.py", line
> 470, in main
> (name, version) = detect_name_and_version(repo, sources[0], options)
> File "/usr/lib/python3/dist-packages/gbp/scripts/import_orig.py", line
> 118, in detect_name_and_version
> cp = parse_changelog_repo(repo, options.debian_branch,
> 'debian/changelog')
> File "/usr/lib/python3/dist-packages/gbp/deb/__init__.py", line 100, in
> parse_changelog_repo
> return ChangeLog(repo.show(sha))
> File "/usr/lib/python3/dist-packages/gbp/deb/changelog.py", line 90, in
> __init__
> self._parse()
> File "/usr/lib/python3/dist-packages/gbp/deb/changelog.py", line 106, in
> _parse
> output = self._run_parsechangelog()
> File "/usr/lib/python3/dist-packages/gbp/deb/changelog.py", line 98, in
> _run_parsechangelog
> (stdout, stderr) = cmd.communicate(self._contents.encode('utf-8'))
> AttributeError: 'bytes' object has no attribute 'encode'
Thanks for the report. The issue was that when you're on upstream/ it
fetches the changelog from the Debian branch via 'git show' which lacked
a decode. I've pushed a fix for this.
-- Guido
>
> Regards.
>