Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package golang-github-masterminds-vcs-dev
A small patch has been added to fix handling of git submodules.
unblock golang-github-masterminds-vcs-dev/1.10.0-2
- -- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'stable'),
(101, 'experimental-debug'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCAAwFiEErvI0h2bzccaJpzYAlaQv6DU1JfkFAljTaYkSHGJlcm5hdEBk
ZWJpYW4ub3JnAAoJEJWkL+g1NSX5KUkP/AmTVAos/YPECSpuFHQgD7xNDbq1H28c
5DaBuoNX6p5A1FN71EkT1YTgM8tid+57A0dfsmyzVQz4JyyMgLUH2DwnoHhrVom5
cu+zM9fru9JGkcGbU5SLgRNzobnfGkjdX6hcHXxFYLfQ8V0GyIU7iUhsqyv+LAm0
BOpsVurjBDKgVBrJPqDH5Q4vYpMyjzcz8crecNFAqPIOYsc60E6o42KpXRuWWd2p
QYR0EmqGZwIydQ8PiAfOQRqCCmVx54tgPS+fTpvTWaC9omQi/sQvwYUL/MubU3xi
7XuXg5AAMiTfAFgwF6NTYxqB6vJBIEPxoGOyHVMOiRKhUa5b0tLB/8A8DOj7Fn9a
kfdXV8BXEqJS0tfoUOsgCo/8BQJiCQ7nmk/zqHkWHiRW+TS4p8Mc1UPr4DD0OCTS
PCTY5i8YZV1zPsE6gGtiqVoMZkjuAMn8KZvCQLmUaKS6HPsW1QLY8IbecmnFzcsx
IivvS1yvapw9GvKGpY3g8hH40nfnBISnjYlcTXRixdqlFMZ+6vCNCgdzg+86Q9w7
bLEtbMd1A86MfjsVKd9hOnySmX96AS/aZ/b+z1g9XlboPYisPD9zRlybfRSmcqXW
AKm3k0tTF/PxQsvyFzfPkYTRfue2yK3VEi1xKk7UTkVa1EThMU/KTdJPeRQS5/iO
R1OA8zSbpEnJ
=fL6Q
-----END PGP SIGNATURE-----
commit 399ec3f7b49d9233038bd0ce15d436730f785377
Author: Vincent Bernat <vinc...@bernat.im>
Date: Tue Mar 21 20:49:14 2017 +0100
d/patch: fix error when exporting git submodules
diff --git a/debian/changelog b/debian/changelog
index 3f08a604e4fe..ee9a36e51926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-github-masterminds-vcs-dev (1.10.0-2) unstable; urgency=medium
+
+ * d/patch: fix error when exporting git submodules.
+
+ -- Vincent Bernat <ber...@debian.org> Tue, 21 Mar 2017 20:48:49 +0100
+
golang-github-masterminds-vcs-dev (1.10.0-1) unstable; urgency=medium
* New upstream version.
diff --git a/debian/patches/63.patch b/debian/patches/63.patch
new file mode 100644
index 000000000000..fe44796eb563
--- /dev/null
+++ b/debian/patches/63.patch
@@ -0,0 +1,26 @@
+From 2449b6d05bf28e1ca4158b41f62d14315886ad03 Mon Sep 17 00:00:00 2001
+From: David Taylor <tinystatemach...@gmail.com>
+Date: Sat, 21 Jan 2017 00:53:40 +0000
+Subject: [PATCH] git: remove extra quotes in submodule export
+
+on the cli, one uses the extra single quotes to ensure the whole cmd is passed
as a single arg despite
+containing spaces, but when passing args in a structured call like this, it
isn't needed.
+
+Fixes Masterminds/glide#745
+---
+ git.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git.go b/git.go
+index b3347df..8c3d5f7 100644
+--- a/git.go
++++ b/git.go
+@@ -385,7 +385,7 @@ func (s *GitRepo) ExportDir(dir string) error {
+ return NewLocalError("Unable to export source", err,
string(out))
+ }
+ // and now, the horror of submodules
+- out, err = s.RunFromDir("git", "submodule", "foreach", "--recursive",
"'git checkout-index -f -a --prefix=\""+filepath.Join(dir, "$path")+"\"'")
++ out, err = s.RunFromDir("git", "submodule", "foreach", "--recursive",
"git checkout-index -f -a --prefix=\""+filepath.Join(dir, "$path")+"/\"")
+ s.log(out)
+ if err != nil {
+ return NewLocalError("Error while exporting submodule sources",
err, string(out))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000000..ccbc18612cf4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+63.patch
