Make dgit-ssh-dispatch not spew (harmless) warnings if caller tries for a shell sessi...

diff --git a/debian/changelog b/debian/changelog
index b5ae32675d1464731c362c21e6b9d3ee3843cf3d..606a3dd82c9e5e8dd60c2ef334e62b87e1c5795f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ dgit (0.31~~) unstable; urgency=low
   Infrastructure:
   * Provide for mirroring git updates to a different server.
   * Provide cgit-regen-config command for cgi-grnet-01.
   Infrastructure:
   * Provide for mirroring git updates to a different server.
   * Provide cgit-regen-config command for cgi-grnet-01.

+  * Make dgit-ssh-dispatch not spew (harmless) warnings if caller
+    tries for a shell session (ie SSH_ORIGINAL_COMMAND not set).

 
 

- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 11 Jul 2015 14:30:19 +0100
+ --

 
 dgit (0.30) unstable; urgency=high
 
 
 dgit (0.30) unstable; urgency=high
 

diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index ed9a23d5685079b61cfff82bc1044ea9cd245bab..9c023d80859fecd63cbc6ca64dfc925818bfc473 100755 (executable)
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -119,7 +119,7 @@ sub serve_up ($) {
 }
 
 sub dispatch () {
 }
 
 sub dispatch () {

-    local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'};
+    local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'} // '';

 
     if (m#^: dgit ($lre) git-check ($lre) ;#) {
        selectpackage $1,$2, sub { prl "divert @_"; finish; };
 
     if (m#^: dgit ($lre) git-check ($lre) ;#) {
        selectpackage $1,$2, sub { prl "divert @_"; finish; };