[devscripts] 02/02: debcheckout: allow setting the user for auth mode in the config
James McCoy
jamessan at debian.org
Tue Oct 8 02:46:58 UTC 2013
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch master
in repository devscripts.
commit a66da5823c8c4bc71853206f22177558d032b6d0
Author: Evgeni Golov <evgeni at debian.org>
Date: Sun Sep 8 19:54:05 2013 +0200
debcheckout: allow setting the user for auth mode in the config
Signed-off-by: James McCoy <jamessan at debian.org>
---
conf.default.in | 3 +++
debian/changelog | 5 +++++
scripts/debcheckout.pl | 10 ++++++++++
3 files changed, 18 insertions(+)
diff --git a/conf.default.in b/conf.default.in
index f96793a..f8aa7fd 100644
--- a/conf.default.in
+++ b/conf.default.in
@@ -216,6 +216,9 @@
# package, unpack it, and move the missing files over.
# DEBCHECKOUT_SOURCE=auto
#
+# Username for authenticated mode, can be overriden with -u|--user.
+# DEBCHECKOUT_USER=''
+#
# See debcheckout(1) for a more precise description of syntax and
# semantics of these settings.
diff --git a/debian/changelog b/debian/changelog
index 88d8c02..43288f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
devscripts (2.13.5) UNRELEASED; urgency=low
+ [ James McCoy ]
* namecheck: Fix “406 Not Acceptable” error when querying Alioth. (Closes:
#725228)
+ [ Evgeni Golov ]
+ * debcheckout: allow setting the user for auth mode in the config. (Closes:
+ #722171)
+
-- James McCoy <jamessan at debian.org> Mon, 07 Oct 2013 22:21:31 -0400
devscripts (2.13.4) unstable; urgency=low
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 8e1dd61..53a3af9 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -217,6 +217,12 @@ This variable determines under what scenarios the associated orig.tar.gz for a
package will be downloaded. See the B<--source> option for a description of
the values.
+=item B<DEBCHECKOUT_USER>
+
+This variable sets the username for authenticated mode. It can be overridden
+with the B<--user> option. Setting this variable does not imply the use of
+authenticated mode, it still has to be activated with B<--auth>.
+
=back
=head1 SEE ALSO
@@ -254,6 +260,7 @@ my @config_files = ('/etc/devscripts.conf', '~/.devscripts');
my %config_vars = (
'DEBCHECKOUT_AUTH_URLS' => '',
'DEBCHECKOUT_SOURCE' => 'auto',
+ 'DEBCHECKOUT_USER' => '',
);
my %config_default = %config_vars;
my $shell_cmd;
@@ -1009,6 +1016,9 @@ sub main() {
# -u|--user implies -a|--auth
$auth = 1 if length $user;
+ # set user from the config file to be used with -a|--auth without -u|--user
+ $user = $config_vars{DEBCHECKOUT_USER} unless $user;
+
$destdir = $ARGV[1] if $#ARGV > 0;
($pkg, $version) = split(/=/, $ARGV[0]);
$version ||= "";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list