Your message dated Thu, 20 Oct 2016 16:42:30 +0000
with message-id <[email protected]>
and subject line Bug#841100: fixed in dgit 2.4
has caused the Debian Bug report #841100,
regarding dgit: gbp-build fails when on master branch
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
841100: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841100
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dgit
Version: 2.1
Severity: normal

dgit passes --git-debian-branch=dgit/sid to gbp-buildpackage(1), which
causes the build to fail when on a branch called 'master'.  Since
'master' is the maintainer view, it should be possible to build the
package from it.

I worked around this by using `--quilt=gbp sbuild` instead of `gbp-build`.

    hephaestus ~/src/helm % dgit 
-cdgit-distro.debian.dgit-tag-format=old,new,maint gbp-build
    Format `3.0 (quilt)', need to check/update patch stack
    examining quilt state (multiple patches, gbp mode)
    dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
    dgit view: found cached (commit id 6ed7ef2f56fb1de511c8a9b2d95dbfbe86aded88)
    dpkg-source: info: using options from work/debian/source/options: 
--extend-diff-ignore=(^|/)(helm-autoloads.el)$
    dpkg-source: info: using source format '3.0 (quilt)'
    dpkg-source: info: building helm using existing ./helm_2.3.0.orig.tar.xz
    dpkg-source: info: building helm in helm_2.3.0-1.debian.tar.xz
    dpkg-source: info: building helm in helm_2.3.0-1.dsc changelog will contain 
changes since 2.2.1-1
    dpkg-genchanges: info: including full source code in upload canonical suite 
name for unstable is sid
    gbp:error: You are not on branch 'dgit/sid' but on 'master'
    gbp:error: Use --git-ignore-branch to ignore or --git-debian-branch to set 
the branch name.
    dgit: failed command: gbp buildpackage -us -uc --git-no-sign-tags 
'--git-builder=dpkg-buildpackage -i'\\'.git/ -I.git -nc -b' 
--git-debian-branch=dgit/sid -v2.2.1-1
    dgit: subprocess failed with error exit status 1

(I believe that the -c, included to workaround #841085, is irrelevant here)

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (900, 'testing')
Architecture: i386 (i686)

Kernel: Linux 4.5.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages dgit depends on:
ii  ca-certificates                   20160104
ii  coreutils                         8.25-2
ii  curl                              7.50.1-1
ii  devscripts                        2.16.8
ii  dpkg-dev                          1.18.10
ii  dput                              0.10.3
ii  git [git-core]                    1:2.9.3-1
ii  git-buildpackage                  0.8.4
ii  libdpkg-perl                      1.18.10
ii  libjson-perl                      2.90-1
ii  liblist-moreutils-perl            0.416-1+b1
ii  libperl5.24 [libdigest-sha-perl]  5.24.1~rc3-3
ii  libtext-iconv-perl                1.7-5+b4
ii  libwww-perl                       6.15-1
ii  perl                              5.24.1~rc3-3

Versions of packages dgit recommends:
ii  openssh-client [ssh-client]  1:7.3p1-1

Versions of packages dgit suggests:
ii  sbuild  0.71.0-2

-- no debconf information

-- 
Sean Whitton

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 2.4

We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ian Jackson <[email protected]> (supplier of updated dgit package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Thu, 20 Oct 2016 16:31:54 +0100
Source: dgit
Binary: dgit dgit-infrastructure
Architecture: all source
Version: 2.4
Distribution: unstable
Urgency: low
Maintainer: Ian Jackson <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Closes: 841100 841383
Description: 
 dgit       - git interoperability with the Debian archive
 dgit-infrastructure - dgit server backend infrastructure
Changes:
 dgit (2.4) unstable; urgency=low
 .
   Bugfixes:
   * split brain cache: Fix a wrong implicit reference to $_.
     Closes:#841383.
   * split brain cache: Make sure to write reflog entries for cache updates
     even if the eventual tree (and therefore commit) is the same.
     Otherwise, after updating dgit, the cache might have the right answer
     but not be refreshed even by a build.
   * dgit gbp-build: No longer invent a --git-debian-branch option.
     Usually the user is a maintainer using split brain, and we should rely
     on their own gbp configuration to specify the right check.
     Closes:#841100.
 .
   Minor docs fix:
   * dgit(1): Document which --ch: options are a good idea.
Checksums-Sha1: 
 ff1ecdb6c2d5818aa6be00302eb8faf60a8b7c03 1340 dgit_2.4.dsc
 ae3abcf7991f96bfbdbf7fd43fe7d49f0fb46f7f 344730 dgit_2.4.tar.gz
 b43839910ee0ec041eaa11b836be23c1e66b987b 39996 dgit-infrastructure_2.4_all.deb
 a9c61b7af5632dc6b4e996b181d0e1e25b6cdc01 79986 dgit_2.4_all.deb
Checksums-Sha256: 
 cddeea5be0aa010f46f9aa62bb219ab762ef475a32fd10ccd206966aec9db29d 1340 
dgit_2.4.dsc
 cc605115b387ec1afc47778f1a606facd1375e12a64f0228351765d00d96b3ea 344730 
dgit_2.4.tar.gz
 3d94ec02852ab2fce190e1ef86adb679b749d602b39bedfd688a4462214c6337 39996 
dgit-infrastructure_2.4_all.deb
 8f1d1d2ca6cb38865f5e3b614423fba140c5e0db710e53f227e69472523a4931 79986 
dgit_2.4_all.deb
Files: 
 dbddd0272d0039662137c1d5ba9feffa 1340 devel optional dgit_2.4.dsc
 ebf96e1b694726d1bddb53a9c2a9cb1f 344730 devel optional dgit_2.4.tar.gz
 4e082a0454ac5e448155affb986170e5 39996 devel extra 
dgit-infrastructure_2.4_all.deb
 ca57d313541a75bbf0ff6d1be443b75f 79986 devel optional dgit_2.4_all.deb

-----BEGIN PGP SIGNATURE-----

iQEcBAEBCAAGBQJYCOPmAAoJEOPjOSNItQ05W5QIAKMdGqeEPchQ1nFFcSuwqDH4
4f96txUxpdu8ng7nHJBpYwa/BLIrhz2Fe/X+QugubLamJaoHPQRGr8hww/hgh5k4
i3vRLz0uxMEUzKhbay/60BNIrtZxuhfjfGqpNAx/+4c1xLOLrabGyXs8JCLpaG1T
LI1UrYGNal1ioCyB7yXWAqNBliDJb6H0eV6E2DxgwrkDjIZcymuxnIQkSV9UfxSG
z+5Z44FTVGrfZKEvambdv2GUZnSfa7uMQ1Hvk8T7aToGzQH4PYzu+yFVCkSV2mvk
v0Mx1snEAkZJjJEUzo86Q5U8+jDteBQf8lrSSC2fpMTI52MU9mt7ESFq+GWqH5k=
=5L+F
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to