Your message dated Sat, 24 Sep 2016 19:24:52 +0000
with message-id <e1bnsza-00046y...@franck.debian.org>
and subject line Bug#835526: fixed in git-build-recipe 0.3.3
has caused the Debian Bug report #835526,
regarding git-build-recipe: FTBFS in testing (broken by new git)
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 ow...@bugs.debian.org
immediately.)
--
835526: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835526
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: src:git-build-recipe
Version: 0.3.2
Severity: serious
Dear maintainer:
I tried to build this package in stretch with "dpkg-buildpackage -A"
(which is what the "Arch: all" autobuilder would do to build it)
but it failed:
--------------------------------------------------------------------------------
[...]
debian/rules build-indep
dh build-indep --with python3 --buildsystem pybuild
dh_testdir -i -O--buildsystem=pybuild
dh_update_autotools_config -i -O--buildsystem=pybuild
dh_auto_configure -i -O--buildsystem=pybuild
I: pybuild base:184: python3.5 setup.py config
running config
dh_auto_build -i -O--buildsystem=pybuild
I: pybuild base:184: /usr/bin/python3 setup.py build
running build
running build_py
creating /<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe
copying gitbuildrecipe/deb_util.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe
copying gitbuildrecipe/recipe.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe
copying gitbuildrecipe/main.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe
copying gitbuildrecipe/deb_version.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe
copying gitbuildrecipe/__init__.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe
creating /<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/tests
copying gitbuildrecipe/tests/test_deb_version.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/tests
copying gitbuildrecipe/tests/test_recipe.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/tests
copying gitbuildrecipe/tests/test_blackbox.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/tests
copying gitbuildrecipe/tests/__init__.py ->
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/tests
debian/rules override_dh_auto_test
make[1]: Entering directory '/<<PKGBUILDDIR>>'
LC_ALL=C.UTF-8 dh_auto_test
I: pybuild base:184: cd /<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build;
python3.5 -m nose
............................................................E.................................................................................................
======================================================================
ERROR:
gitbuildrecipe.tests.test_recipe.BuildTreeTests.test_build_tree_merge_unrelated
----------------------------------------------------------------------
testtools.testresult.real._StringException: Traceback (most recent call last):
File
"/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/recipe.py", line
348, in merge_branch
child_branch.commit)
File
"/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/recipe.py", line
637, in git_call
**kwargs)
File "/usr/lib/python3.5/subprocess.py", line 626, in check_output
**kwargs).stdout
File "/usr/lib/python3.5/subprocess.py", line 708, in run
output=stdout, stderr=stderr)
subprocess.CalledProcessError: Command '['git', '-C', 'target', 'merge',
'--commit', '-m', 'Merge HEAD', 'cffd324cab4213c080815e51045e11e544b4791a']'
returned non-zero exit status 128
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File
"/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/tests/test_recipe.py",
line 620, in test_build_tree_merge_unrelated
build_tree(base_branch, "target")
File
"/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/recipe.py", line
464, in build_tree
_build_inner_tree(base_branch, target_path)
File
"/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/recipe.py", line
388, in _build_inner_tree
instruction.apply(target_path)
File
"/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/recipe.py", line
520, in apply
merge_branch(self.recipe_branch, target_path)
File
"/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build/gitbuildrecipe/recipe.py", line
350, in merge_branch
raise MergeFailed(e.output)
gitbuildrecipe.recipe.MergeFailed: git merge failed:
fatal: refusing to merge unrelated histories
-------------------- >> begin captured logging << --------------------
root: INFO: Building tree.
root: INFO: Retrieving 'source1' to put at 'target'.
root: INFO: Merging 'source2' in to 'target'.
--------------------- >> end captured logging << ---------------------
----------------------------------------------------------------------
Ran 158 tests in 18.388s
FAILED (errors=1)
E: pybuild pybuild:276: test: plugin distutils failed with: exit code=1: cd
/<<PKGBUILDDIR>>/.pybuild/pythonX.Y_3.5/build; python3.5 -m nose
dh_auto_test: pybuild --test --test-nose -i python{version} -p 3.5 returned
exit code 13
debian/rules:6: recipe for target 'override_dh_auto_test' failed
make[1]: *** [override_dh_auto_test] Error 25
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
debian/rules:3: recipe for target 'build-indep' failed
make: *** [build-indep] Error 2
dpkg-buildpackage: error: debian/rules build-indep gave error exit status 2
--------------------------------------------------------------------------------
This used to build ok, so this failure seems related to git 2.9.3,
which is in testing since a few days.
Thanks.
--- End Message ---
--- Begin Message ---
Source: git-build-recipe
Source-Version: 0.3.3
We believe that the bug you reported is fixed in the latest version of
git-build-recipe, 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 835...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Colin Watson <cjwat...@debian.org> (supplier of updated git-build-recipe
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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 24 Sep 2016 18:11:13 +0100
Source: git-build-recipe
Binary: git-build-recipe
Architecture: source
Version: 0.3.3
Distribution: unstable
Urgency: medium
Maintainer: Colin Watson <cjwat...@ubuntu.com>
Changed-By: Colin Watson <cjwat...@debian.org>
Description:
git-build-recipe - construct a Git branch from a recipe
Closes: 835526
Changes:
git-build-recipe (0.3.3) unstable; urgency=medium
.
* Handle git 2.9.0 (closes: #835526).
Checksums-Sha1:
6f724f86ea1e45b2c2b832597502e4224b73ab38 1804 git-build-recipe_0.3.3.dsc
161f8906e1a4b6b98b7f4eb1d9d64af0700e5017 38560 git-build-recipe_0.3.3.tar.xz
Checksums-Sha256:
8ddab7194b2dd8123d16540e7c9083b584a0649f57a5a6c671afa03eda1b570d 1804
git-build-recipe_0.3.3.dsc
c324639c078fd709bc396b30150af542b6aae36b0a956276c05e97d082f03353 38560
git-build-recipe_0.3.3.tar.xz
Files:
6f37c965acc819c3b4d2cee3bcdaa5cb 1804 vcs optional git-build-recipe_0.3.3.dsc
811a91a299356bfe4b0c9000e674cbae 38560 vcs optional
git-build-recipe_0.3.3.tar.xz
-----BEGIN PGP SIGNATURE-----
Comment: Colin Watson <cjwat...@debian.org> -- Debian developer
iQIcBAEBCAAGBQJX5rQnAAoJEDk1h9l9hlALI1wQAKa9l/OIqalt/NwmwFx+4jgx
LGdGZAP6ih+Ra4n6beH3GfvZiiIduSe7Lwwc3Pi2R12JxYCFwTBnd3EyYa7ofc1C
57NeySk9Ay2SNiY9tlKufN6Ske5g+YKpa3GbmM3LR90PRPY6wxLMvhw0COcVol2G
Xo6Cm1zqxhGY5dTBlovC4aSIiag9rOqw4LTf9YAyzkgK79aZGABQQhBncS57rU6M
KBYyHut2XUjX2LWZbDdjD8pnpkOp3IZb/LY6yywMf/rFVnXKZTGDYNGHDNQFFvqW
VL4WbVzVx/aDQePYpnPDQmxroOIfvk+S9N+BcGhtCbFj7sBTY9wRlEIxEBIZSpVg
Tzc6WZDZbK547xZ9evxDNk1yyTuwLQ68Bbcvl0t3urozi0BYgXaED5m/udz44z2p
rS6aRlfmH6q8SdvvBnT0d4iI9dbpy7KUtYmLArImWrbgoXW+v2RE+kbMgkQlnH0B
yUfIVcvohpmuAynMqo0qQnb2sJVzEoEXcO68amujDuBvJfoISR7iRvmldmSLrbsx
h8vf4FyC2oOTvHyVPqp+RxJLx+SLzsoRV2485KJxU/xqoypZ971UBM5j5aBo2Lv4
6DV1W5rB+lBzT5HwngelIcObWTyanizdNAr+2++tLYmJ3iw4NdG8QPH4wuExreuR
9q6qa7jBuWh/sXb11qey
=IUlA
-----END PGP SIGNATURE-----
--- End Message ---