Bug 348575: Have the linux installer not remove the tinderbox staging directory (r=KaiRo) and have the tinderbox script remove its own staging directory (and remove previous hack), r=rhelmer

This commit is contained in:
ajschult%verizon.net 2006-09-30 02:02:31 +00:00
parent 9c06bcb5b2
commit 91f31e1dae
2 changed files with 7 additions and 5 deletions

View File

@ -315,9 +315,6 @@ sub packit {
TinderUtils::run_shell_command("cp -r $package_location/xpi $stagedir/windows-xpi");
}
} elsif (TinderUtils::is_linux()) {
# XXX: this seems to be removed by the packaging process above
mkdir($stagedir, 0775);
if ($Settings::stub_installer) {
TinderUtils::run_shell_command("cp $package_location/stub/*.tar.* $stagedir/");
}
@ -1346,6 +1343,8 @@ sub main {
return returnStatus("Pushing package $local_build_dir failed", ("testfailed"));
}
TinderUtils::run_shell_command("rm -rf $local_build_dir");
if ($cachebuild) {
# Above, we created last-built.new at the start of the cachebuild cycle.
# If the last-built.new file still exists, move it to the last-built file.

View File

@ -122,12 +122,15 @@ $SUBDIR = "$aMozAppName-installer";
if (-e $ROOT)
{
if (-w $ROOT)
{ system("rm -rf $ROOT"); }
{ system("rm -rf $STAGE $RAW $XPI $BLOB $STUB"); }
else
{ die "--- deliver.pl: check perms on $ROOT: $!"; }
}
else
{
mkdir($ROOT, 0777) || die "--- deliver.pl: couldn't mkdir root: $!";
}
mkdir($ROOT, 0777) || die "--- deliver.pl: couldn't mkdir root: $!";
mkdir($STAGE, 0777) || die "--- deliver.pl: couldn't mkdir stage: $!";
mkdir($RAW, 0777) || die "--- deliver.pl: couldn't mkdir raw: $!";
mkdir($XPI, 0777) || die "--- deliver.pl: couldn't mkdir xpi: $!";