In access_quirk, filter by defined at the end. (nfc)

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 6e175ad2b1f08b03088cd57f63087bc62c20fdb3..57159b70fd62cdba67c3568736bdd594ccd6221f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -601,9 +601,8 @@ sub access_distros () {
     my @l = access_basedistro();
 
     my (undef,$quirkdistro) = access_quirk();
-    unshift @l, $quirkdistro if defined $quirkdistro;
-
-    return @l;
+    unshift @l, $quirkdistro;
+    return grep { defined } @l;
 }
 
 sub access_cfg (@) {
@@ -655,6 +654,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 +833,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 +981,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 +1001,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') {