From c683c8f8e7b9e917b68ed02bd584a505b1636734 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 2 Nov 2014 16:09:49 +0000
Subject: Introduce access_runeinfo, and put basedistro name in ssh command
 hint string

---
 dgit | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 6e175ad..5f88625 100755
--- a/dgit
+++ b/dgit
@@ -655,6 +655,11 @@ sub access_cfg_ssh () {
     }
 }
 
+sub access_runeinfo ($) {
+    my ($info) = @_;
+    return ": dgit ".access_basedistro()." $info ;";
+}
+
 sub access_someuserhost ($) {
     my ($some) = @_;
     my $user = access_cfg("$some-user",'username');
@@ -829,7 +834,7 @@ sub sshpsql ($$$) {
     my ($userhost,$dbname) = ($`,$'); #';
     my @rows;
     my @cmd = (access_cfg_ssh, $userhost,
-	       ": dgit ssh-psql $runeinfo ;".
+	       access_runeinfo("ssh-psql $runeinfo").
 	       " export LANG=C;".
 	       " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
     printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
@@ -977,7 +982,7 @@ sub check_for_git () {
     if ($how eq 'ssh-cmd') {
 	my @cmd =
 	    (access_cfg_ssh, access_gituserhost(),
-	     ": dgit git-check $package ;".
+	     access_runeinfo("git-check $package").
 	     " set -e; cd ".access_cfg('git-path').";".
 	     " if test -d $package.git; then echo 1; else echo 0; fi");
 	my $r= cmdoutput @cmd;
@@ -997,7 +1002,7 @@ sub create_remote_git_repo () {
     if ($how eq 'ssh-cmd') {
 	runcmd_ordryrun
 	    (access_cfg_ssh, access_gituserhost(),
-	     " : dgit git-create $package ; ".
+	     access_runeinfo("git-create $package").
 	     "set -e; cd ".access_cfg('git-path').";".
 	     " cp -a _template $package.git");
     } elsif ($how eq 'true') {
-- 
cgit v1.2.3