Acknowledgement sent
to Nicolas Braud-Santoni <[email protected]>:
New Bug report received and forwarded. Copy sent to Guido Günther <[email protected]>.
(Mon, 11 Mar 2019 00:33:04 GMT) (full text, mbox, link).
Package: git-buildpackage
Version: 0.9.13
Severity: normal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi,
I'm trying to import am existing package in git, with the caveat that I already
set up the upstream branch and tags -- I want to base it off upstream's git
history, so I can easily cherry-pick patches.
Unfortunately, when running `gbp import-dscs --debsnap` I ran into two issues:
1. The current content of the branch are overwritten, including debian/gbp.conf,
and so gbp stops observing parameters set there.
It is easily worked around by passing those parameters on the CLI, but gbp
should probably read its configuration once and keep it in memory through the
whole execution.
2. gbp import-dscs will overwrite existing upstream branch and tags.
The behaviour I expected would have been to keep the existing tags,
and import the content of debian/ in the packaging branch (along with adding
the necessary data for pristine-tar).
Am I simply using gbp wrong, or is this legitimately a bug?
If so, are you aware of a possible workaround?
Best,
nicoo
- -- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages git-buildpackage depends on:
ii devscripts 2.19.3
ii git 1:2.20.1-2
ii man-db 2.8.5-2
ii python3 3.7.2-1
ii python3-dateutil 2.7.3-3
ii python3-pkg-resources 40.8.0-1
ii sensible-utils 0.0.12
Versions of packages git-buildpackage recommends:
ii pristine-tar 1.46
ii python3-requests 2.21.0-1
ii sbuild 0.78.1-1
Versions of packages git-buildpackage suggests:
pn python3-notify2 <none>
ii sudo 1.8.27-1
ii unzip 6.0-22
- -- Configuration Files:
/etc/git-buildpackage/gbp.conf changed:
[DEFAULT]
builder = sbuild -v --no-clean-source
[buildpackage]
postbuild = cd /opt/deb/buildarea && apt-ftparchive packages . > Packages
export-dir = /opt/deb/buildarea
dist = DEP14
[import-orig]
[import-dsc]
[dch]
[pq]
[clone]
[pull]
[create-remote-repo]
[remote-config pkg-libvirt]
remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s
template-dir = /srv/alioth.debian.org/chroot/home/groups/pkg-libvirt/git-template
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
iQJFBAEBCgAvFiEEU7EqA8ZVHYoLJhPE5vmO4pLV7MsFAlyFrBQRHG5pY29vQGRl
Ymlhbi5vcmcACgkQ5vmO4pLV7MtWzQ//Wim9AsNfI08C79n8xNNx5rosYSsqnxaK
ESKIuME46elcDIZzQmAPSerPmF0uL9fax01KpZkSIwyOjlIbgHnTsIxEg6rwls76
kgJWopcGFu7ip3mDa60EPtOHYQMjNoOolSiggw1CvcYE284vr2/+V8kIurd681qA
ixDWRR6XddvBrbhEsNKJ+Uw2VuQidt2zrBaHZ19ArUN+6z7h5R0uTTOTxjeb0kJK
ESJJnL7IwlwHVe67+U9dAhKJoVTXqCvC0cmWQSfvnVSDaE6rAbHCAqp3S+Sq9s3N
RUWs5+nvr+TzPz95uE7tMIJiYYmL4IOFLXGcRHC1pwA7v25EO4Z7an1CAbH+oq+i
7+87RaetBwqa6MSSiIjmcfyo4Nfl2W75JcG8yArK+g+7BEk7Zv0XhuEeosqAsTtj
2QRl7flL5PCnS4sknf5ZM7ifj2M3kpLFfjTdjxaZecUH0+YsO+JqzPQyAvXfpEHd
CS2EYl7042jgbNH/ZCZqxLbQIAFH66rQbqBc32yZGw8u0oL2ZHwAG27TGm8aLvO5
drmf760o/B6nRXYdV8VXbsBcYeguUuqPhfnfHTl3s1WB5pR1QjZ5uZFZDQS2mNLD
VViSY7E1qdRrlhTYYpFZwblpdfAQWJlBuWcXk2cqyaRYF6MUu2g/wC5aCfeiTEHY
Iqotka3eiN8=
=vj98
-----END PGP SIGNATURE-----
Information forwarded
to [email protected]: Bug#924284; Package git-buildpackage.
(Thu, 21 Mar 2019 09:39:07 GMT) (full text, mbox, link).
Acknowledgement sent
to Guido Günther <[email protected]>:
Extra info received and forwarded to list.
(Thu, 21 Mar 2019 09:39:07 GMT) (full text, mbox, link).
Hi,
On Mon, Mar 11, 2019 at 01:30:15AM +0100, Nicolas Braud-Santoni wrote:
> Package: git-buildpackage
> Version: 0.9.13
> Severity: normal
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
>
> Hi,
>
> I'm trying to import am existing package in git, with the caveat that I already
> set up the upstream branch and tags -- I want to base it off upstream's git
> history, so I can easily cherry-pick patches.
>
> Unfortunately, when running `gbp import-dscs --debsnap` I ran into two
> issues:
I don't think that use case is well supported yet.
>
> 1. The current content of the branch are overwritten, including debian/gbp.conf,
> and so gbp stops observing parameters set there.
>
> It is easily worked around by passing those parameters on the CLI, but gbp
> should probably read its configuration once and keep it in memory through the
> whole execution.
You can ignore all repo's gbp.conf via `--ignore-repo-config` but that
won't help since the existing one isn't read either. You can run
gbp-import-dsc for each version individually which will make it pick up
the right config.
> 2. gbp import-dscs will overwrite existing upstream branch and tags.
>
> The behaviour I expected would have been to keep the existing tags,
> and import the content of debian/ in the packaging branch (along with adding
> the necessary data for pristine-tar).
I would have expected it to overwrite branch content but not tags since
we don't pass --allow-same-version and that would only affect debian
tags anyway. Do you have a testcase that shows how tags are
"overwritten".
I'm happy to take patches to improve the situation otherwise running
gbp-import-dscs on an empty repo and adding the existing package as a
remote should work better.
Cheers,
-- Guido
Debbugs is free software and licensed under the terms of the GNU General
Public License version 2. The current version can be obtained
from https://bugs.debian.org/debbugs-source/.