Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 280193: Round up places using data/ instead of $datadir - Patch by Marc Schumann <wurblzap@gmail.com> r=LpSolit, a=justdave

Browse Source
This commit is contained in:
lpsolit%gmail.com 2005-03-22 19:22:40 +00:00
parent 3de403eff7
commit cd0f6ce9dd
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webtools/bugzilla/Bugzilla/Error.pm
View File

@ -26,7 +26,7 @@ use base qw(Exporter);
@Bugzilla::Error::EXPORT = qw(ThrowCodeError ThrowTemplateError ThrowUserError);
use Bugzilla::Config;
use Bugzilla::Config qw($datadir);
use Bugzilla::Constants;
use Bugzilla::Util;
use Date::Format;
@ -42,8 +42,8 @@ sub _throw_error {
# and the transaction is rolled back (if supported)
Bugzilla->dbh->bz_unlock_tables(UNLOCK_ABORT);
# If a writable data/errorlog exists, log error details there.
if (-w "data/errorlog") {
# If a writable $datadir/errorlog exists, log error details there.
if (-w "$datadir/errorlog") {
require Data::Dumper;
my $mesg = "";
for (1..75) { $mesg .= "-"; };
@ -67,7 +67,7 @@ sub _throw_error {
$val = "*****" if $val =~ /password|http_pass/i;
$mesg .= "[$$] " . Data::Dumper->Dump([$val],["env($var)"]);
}
open(ERRORLOGFID, ">>data/errorlog");
open(ERRORLOGFID, ">>$datadir/errorlog");
print ERRORLOGFID "$mesg\n";
close ERRORLOGFID;
}

8
webtools/bugzilla/editclassifications.cgi
View File

@ -27,7 +27,7 @@ use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::Util;
use Bugzilla::Error;
use Bugzilla::Config;
use Bugzilla::Config qw($datadir);
require "globals.pl";
@ -166,7 +166,7 @@ if ($action eq 'new') {
$sth->execute($classification,$description);
# Make versioncache flush
unlink "data/versioncache";
unlink "$datadir/versioncache";
LoadTemplate($action);
}
@ -230,7 +230,7 @@ if ($action eq 'delete') {
$dbh->bz_unlock_tables();
unlink "data/versioncache";
unlink "$datadir/versioncache";
LoadTemplate($action);
}
@ -320,7 +320,7 @@ if ($action eq 'update') {
$dbh->bz_unlock_tables();
unlink "data/versioncache";
unlink "$datadir/versioncache";
LoadTemplate($action);
}

9
webtools/bugzilla/testserver.pl
View File

@ -19,6 +19,7 @@
# issues as possible.
use Socket;
use Bugzilla::Config qw($datadir);
my $envpath = $ENV{'PATH'};
use lib ".";
use strict;
@ -165,8 +166,8 @@ if ($@ eq '') {
$image->fill(50, 50, $red);
if ($image->can('png')) {
create_file('data/testgd-local.png', $image->png);
check_image('data/testgd-local.png', 't/testgd.png', 'GD', 'PNG');
create_file("$datadir/testgd-local.png", $image->png);
check_image("$datadir/testgd-local.png", 't/testgd.png', 'GD', 'PNG');
} else {
die "GD doesn't support PNG generation\n";
}
@ -188,8 +189,8 @@ if ($@ eq '') {
$chart->add_pt('bar', 16, 32);
my $type = $chart->can('gif') ? 'gif' : 'png';
$chart->$type("data/testchart-local.$type");
check_image("data/testchart-local.$type", "t/testchart.$type",
$chart->$type("$datadir/testchart-local.$type");
check_image("$datadir/testchart-local.$type", "t/testchart.$type",
"Chart", uc($type));
};
if ($@ ne '') {