From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 2 Nov 2014 16:52:57 +0000 (+0000)
Subject: New $some-user-force config variable
X-Git-Tag: debian/0.30~303
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b2930de82f96119b5e4c3ac8f7c855477dfc2e6b;ds=sidebyside

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.
---

diff --git a/dgit b/dgit
index af710657..38b02e4e 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;
 }