summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-11-02 16:52:57 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-11-08 22:22:20 +0000
commitb2930de82f96119b5e4c3ac8f7c855477dfc2e6b (patch)
tree1e0afaf259bbfcb31ccb8bd4b1fb0604fd383adb /dgit
parent2479a589cce5c9c12044c89b3d530912efedb78e (diff)
New $some-user-force config variable
This will allow dgit-distro.debian.git-user-force to be set to dgit, but reset to '' by dgit-distro.debian/alioth.git-user-force, so that when diverted back to alioth, we fall back to the previously-specified username.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit4
1 files changed, 3 insertions, 1 deletions
diff --git a/dgit b/dgit
index af71065..38b02e4 100755
--- a/dgit
+++ b/dgit
@@ -664,7 +664,9 @@ sub access_runeinfo ($) {
sub access_someuserhost ($) {
my ($some) = @_;
- my $user = access_cfg("$some-user",'username');
+ my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
+ defined($user) && length($user) or
+ $user = access_cfg("$some-user",'username');
my $host = access_cfg("$some-host");
return length($user) ? "$user\@$host" : $host;
}