mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-27 07:34:20 +00:00
Reorder $chromelist assignment to avoid bogus call to File::Spec->canonpath() and excessive warnings.
Bug #125588
This commit is contained in:
parent
2803c78e79
commit
9f00de052f
@ -122,8 +122,8 @@ while (<JARFILE>)
|
|||||||
# Split up the common format, which is e.g.:
|
# Split up the common format, which is e.g.:
|
||||||
# messenger/skin/fred/foo.xul (xpfe/barney/wilma/foo.xul)
|
# messenger/skin/fred/foo.xul (xpfe/barney/wilma/foo.xul)
|
||||||
m/(.*)\s+\((.*)\)/;
|
m/(.*)\s+\((.*)\)/;
|
||||||
my $chromefile = File::Spec->canonpath("$jarfilename/$1");
|
my $chromefile = $1;
|
||||||
my $cvsfile = File::Spec->canonpath($2);
|
my $cvsfile = $2;
|
||||||
|
|
||||||
# Deal with those jar.mns which have just a single line,
|
# Deal with those jar.mns which have just a single line,
|
||||||
# implying that the file is in the current directory.
|
# implying that the file is in the current directory.
|
||||||
@ -132,6 +132,9 @@ while (<JARFILE>)
|
|||||||
$chromefile = File::Spec->canonpath("$jarfilename/$_");
|
$chromefile = File::Spec->canonpath("$jarfilename/$_");
|
||||||
$_ =~ /.*\/(.*?)$/;
|
$_ =~ /.*\/(.*?)$/;
|
||||||
$cvsfile = File::Spec->canonpath($1);
|
$cvsfile = File::Spec->canonpath($1);
|
||||||
|
} else {
|
||||||
|
$chromefile = File::Spec->canonpath("$jarfilename/$chromefile");
|
||||||
|
$cvsfile = File::Spec->canonpath($cvsfile);
|
||||||
}
|
}
|
||||||
|
|
||||||
# Convert to platform-specific separator for the chrome version.
|
# Convert to platform-specific separator for the chrome version.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user