chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a debug message in the obsolete sshpsql archive access driver.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index bcb6a9c2d040e5adfe3c12f2c8dc8402b2456f6f..a0f560ae66bfc4091af80410fab18396fda62359 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-528,6
+528,8
@@
sub git_slurp_config () {
sub git_get_config ($) {
my ($c) = @_;
my $l = $gitcfg{$c};
sub git_get_config ($) {
my ($c) = @_;
my $l = $gitcfg{$c};
+ printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
+ if $debuglevel >= 4;
$l or return undef;
@$l==1 or badcfg "multiple values for $c" if @$l > 1;
return $l->[0];
$l or return undef;
@$l==1 or badcfg "multiple values for $c" if @$l > 1;
return $l->[0];
@@
-982,7
+984,7
@@
sub sshpsql ($$$) {
open P, "-|", @cmd or die $!;
while (<P>) {
chomp or die;
open P, "-|", @cmd or die $!;
while (<P>) {
chomp or die;
- printdebug("
$debugprefix
>|$_|\n");
+ printdebug(">|$_|\n");
push @rows, $_;
}
$!=0; $?=0; close P or failedcmd @cmd;
push @rows, $_;
}
$!=0; $?=0; close P or failedcmd @cmd;
@@
-3185,8
+3187,10
@@
sub finalise_opts_opts () {
}
foreach my $c (access_cfg_cfgs("opts-$k")) {
}
foreach my $c (access_cfg_cfgs("opts-$k")) {
- local ($debuglevel) = $debuglevel-2;
my $vl = $gitcfg{$c};
my $vl = $gitcfg{$c};
+ printdebug "CL $c ",
+ ($vl ? join " ", map { shellquote } @$vl : ""),
+ "\n" if $debuglevel >= 4;
next unless $vl;
badcfg "cannot configure options for $k"
if $opts_opt_cmdonly{$k};
next unless $vl;
badcfg "cannot configure options for $k"
if $opts_opt_cmdonly{$k};