Package: devscripts
Version: 2.12.6
Severity: wishlist
Tags: patch

Hi,

when using debcheckout -a, it will complain when one wants to try to
checkout a repo from ~/public_git. To get it fixed, one has to pass -u,
which can get annoying, so let's set it in ~/.decscripts :)

Patch attached.

Greets
Evgeni

-- Package-specific info:

--- /etc/devscripts.conf ---

--- ~/.devscripts ---
Not present

-- System Information:
Debian Release: 7.1
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages devscripts depends on:
ii  dpkg-dev  1.16.10
ii  libc6     2.13-38
ii  perl      5.14.2-21
ii  python    2.7.3-4

Versions of packages devscripts recommends:
pn  at                        <none>
ii  curl                      7.26.0-1+wheezy3
ii  dctrl-tools               2.22.2
pn  debian-keyring            <none>
ii  dput                      0.9.6.3+nmu2
pn  equivs                    <none>
ii  fakeroot                  1.18.4-2
ii  gnupg                     1.4.12-7+deb7u1
ii  libcrypt-ssleay-perl      0.58-1
ii  libdistro-info-perl       0.10
ii  libjson-perl              2.53-1
pn  libparse-debcontrol-perl  <none>
pn  libsoap-lite-perl         <none>
ii  liburi-perl               1.60-1
ii  libwww-perl               6.04-1
pn  lintian                   <none>
ii  man-db                    2.6.2-1
ii  patch                     2.6.1-3
ii  patchutils                0.3.2-1.1
ii  python-debian             0.1.21
ii  python-magic              5.11-2
ii  sensible-utils            0.0.7
ii  strace                    4.5.20-2.3
ii  unzip                     6.0-8
pn  wdiff                     <none>
ii  wget                      1.13.4-3
ii  xz-utils                  5.1.1alpha+20120614-2

Versions of packages devscripts suggests:
ii  build-essential              11.5
pn  cvs-buildpackage             <none>
pn  devscripts-el                <none>
ii  gnuplot                      4.6.0-8
ii  heirloom-mailx [mailx]       12.5-2
ii  libauthen-sasl-perl          2.1500-1
pn  libfile-desktopentry-perl    <none>
ii  libnet-smtp-ssl-perl         1.01-3
pn  libterm-size-perl            <none>
ii  libtimedate-perl             1.2000-1
ii  libyaml-syck-perl            1.20-1
ii  mutt                         1.5.21-6.3
ii  openssh-client [ssh-client]  1:6.0p1-4
ii  svn-buildpackage             0.8.5
ii  w3m                          0.5.3-8

-- no debconf information
>From f43def8727b380de1b1fb17d3b271a74ab0a3130 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <[email protected]>
Date: Sun, 8 Sep 2013 19:54:05 +0200
Subject: [PATCH] debcheckout: allow setting the user for auth mode in the
 config

---
 conf.default.in        |    3 +++
 scripts/debcheckout.pl |   10 ++++++++++
 2 files changed, 13 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/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 8e1dd61..6c9af04 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 length $user;
+
     $destdir = $ARGV[1] if $#ARGV > 0;
     ($pkg, $version) = split(/=/, $ARGV[0]);
     $version ||= "";
-- 
1.7.10.4

Reply via email to