git://git.exim.org
/
buildfarm-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
URI escape branch names in URLs. Don't strip + from branch name.
[buildfarm-server.git]
/
cgi-bin
/
eximstatus.pl
diff --git
a/cgi-bin/eximstatus.pl
b/cgi-bin/eximstatus.pl
index e911e6bedc03b471c0fcd0098c4c53bdf84add25..d2e46380eca391bb0e4dc9ea33c219af470c84e5 100755
(executable)
--- a/
cgi-bin/eximstatus.pl
+++ b/
cgi-bin/eximstatus.pl
@@
-9,6
+9,7
@@
See accompanying License file for license details
=cut
use strict;
=cut
use strict;
+use URI::Escape;
use vars qw($dbhost $dbname $dbuser $dbpass $dbport
$all_stat $fail_stat $change_stat $green_stat
use vars qw($dbhost $dbname $dbuser $dbpass $dbport
$all_stat $fail_stat $change_stat $green_stat
@@
-30,8
+31,10
@@
use Mail::Send;
use Time::ParseDate;
use Storable qw(thaw);
use Time::ParseDate;
use Storable qw(thaw);
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
-my $buildlogs = "$ENV{BFConfDir}/buildlogs";
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";
+
+my $buildlogs = "$RealBin/../buildlogs";
die "no dbname" unless $dbname;
die "no dbuser" unless $dbuser;
die "no dbname" unless $dbname;
die "no dbuser" unless $dbuser;
@@
-74,7
+77,7
@@
if (open($brhandle,"../htdocs/branches_of_interest.txt"))
my $content =
my $content =
-
"branch=$branch
&res=$res&stage=$stage&animal=$animal&".
+
'branch=' . uri_escape($branch) . "
&res=$res&stage=$stage&animal=$animal&".
"ts=$ts&log=$log&conf=$conf";
my $extra_content =
"ts=$ts&log=$log&conf=$conf";
my $extra_content =
@@
-227,7
+230,7
@@
if ($log_archive)
chomp $githeadref;
close $githead;
}
chomp $githeadref;
close $githead;
}
-
#
unlink $archname;
+ unlink $archname;
}
my $config_flags;
}
my $config_flags;
@@
-297,6
+300,10
@@
if (@config_flags)
@config_flags = grep {! m/=/ } @config_flags;
map {s/\s+//g; $_=qq("$_"); } @config_flags;
push @config_flags,'git' if $client_conf->{scm} eq 'git';
@config_flags = grep {! m/=/ } @config_flags;
map {s/\s+//g; $_=qq("$_"); } @config_flags;
push @config_flags,'git' if $client_conf->{scm} eq 'git';
+ push(@config_flags, 'doc')
+ if (defined $client_conf->{'optional_steps'}->{'make-doc'});
+ push(@config_flags, 'test')
+ if (defined $client_conf->{'optional_steps'}->{'test'});
$config_flags = '{' . join(',',@config_flags) . '}' ;
}
$config_flags = '{' . join(',',@config_flags) . '}' ;
}