Bug#821205: jessie-pu: package gitolite3/3.6.1-2
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
This is a fix for a missing functionality bug (819841) in jessie. The
fix has been in several subsequent upstream releases, so it should be
safe, even if it does involve regex-soup.
diff -u gitolite3-3.6.1/debian/changelog gitolite3-3.6.1/debian/changelog
--- gitolite3-3.6.1/debian/changelog
+++ gitolite3-3.6.1/debian/changelog
@@ -1,3 +1,11 @@
+gitolite3 (3.6.1-2+deb8u1) stable; urgency=medium
+
+ * Bug fix: "Git-annex-shell not working", thanks to risca (Closes:
+ #819941). Enable repository paths without '~/'. Cherry picked from
+ upstream commit, 276cf761de0522a19b0312f4466fc497a2a38b5f
+
+ -- David Bremner <bremner@debian.org> Sat, 16 Apr 2016 13:16:24 -0300
+
gitolite3 (3.6.1-2) unstable; urgency=low
[ Rhonda D'Vine ]
only in patch2:
unchanged:
--- gitolite3-3.6.1.orig/src/commands/git-annex-shell
+++ gitolite3-3.6.1/src/commands/git-annex-shell
@@ -18,12 +18,13 @@
# Expect commands like:
# git-annex-shell 'configlist' '/~/repo'
+# git-annex-shell 'configlist' '/repo'
# git-annex-shell 'sendkey' '/~/repo' 'key'
# The parameters are always single quoted, and the repo path is always
# the second parameter.
# Further parameters are not validated here (see below).
die "bad git-annex-shell command: $cmd"
- unless $cmd =~ m#^(git-annex-shell '\w+' ')/\~/([0-9a-zA-Z][0-9a-zA-Z._\@/+-]*)('( .*|))$#;
+ unless $cmd =~ m#^(git-annex-shell '\w+' ')/(?:\~/)?([0-9a-zA-Z][0-9a-zA-Z._\@/+-]*)('( .*|))$#;
my $start = $1;
my $repo = $2;
my $end = $3;
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (900, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 4.4.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: