Bug#853971: unblock: bzr-git/0.6.13-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package bzr-git
This fixes a trivial FTBFS (#852631) caused by a change in one of bzr-git's dependencies (dulwich).
debdiff attached.
unblock bzr-git/0.6.13-2
-- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru bzr-git-0.6.13/debian/changelog bzr-git-0.6.13/debian/changelog
--- bzr-git-0.6.13/debian/changelog 2016-07-04 21:35:56.000000000 +0000
+++ bzr-git-0.6.13/debian/changelog 2017-01-26 02:25:13.000000000 +0000
@@ -1,3 +1,10 @@
+bzr-git (0.6.13-2) unstable; urgency=medium
+
+ * Add patch fix_dulwich_compat.diff: Fix compatibility with newer
+ versions of Dulwich. Closes: #852631
+
+ -- Jelmer Vernooij <jelmer@debian.org> Thu, 26 Jan 2017 02:25:13 +0000
+
bzr-git (0.6.13-1) unstable; urgency=medium
* New upstream release.
diff -Nru bzr-git-0.6.13/debian/patches/fix_dulwich_compat.diff bzr-git-0.6.13/debian/patches/fix_dulwich_compat.diff
--- bzr-git-0.6.13/debian/patches/fix_dulwich_compat.diff 1970-01-01 00:00:00.000000000 +0000
+++ bzr-git-0.6.13/debian/patches/fix_dulwich_compat.diff 2017-01-26 02:22:59.000000000 +0000
@@ -0,0 +1,25 @@
+=== modified file 'transportgit.py'
+--- a/transportgit.py 2016-07-03 12:31:18 +0000
++++ b/transportgit.py 2017-01-26 01:15:41 +0000
+@@ -21,6 +21,7 @@
+ from cStringIO import StringIO
+
+ import os
++import sys
+ import urllib
+
+ from dulwich.errors import (
+@@ -323,6 +324,12 @@
+ super(TransportRepo, self).__init__(object_store,
+ refs_container)
+
++ def _determine_file_mode(self):
++ # Be consistent with bzr
++ if sys.platform == 'win32':
++ return False
++ return True
++
+ def get_named_file(self, path):
+ """Get a file from the control dir with a specific name.
+
+
diff -Nru bzr-git-0.6.13/debian/patches/series bzr-git-0.6.13/debian/patches/series
--- bzr-git-0.6.13/debian/patches/series 2016-04-24 16:03:25.000000000 +0000
+++ bzr-git-0.6.13/debian/patches/series 2017-01-26 02:23:05.000000000 +0000
@@ -1 +1,2 @@
fix_test_pristine_tar.diff
+fix_dulwich_compat.diff
Reply to: