wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Test bustage fix for bug 487346

Browse Source
This commit is contained in:
Robert Strong 2009-04-16 19:46:03 -07:00
parent 3836e0c168
commit e0571058b0
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
toolkit/mozapps/update/test/unit/head_update.js
View File

@ -775,21 +775,25 @@ gProfD.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
var gRealGreD = gDirSvc.get(NS_GRE_DIR, AUS_Ci.nsIFile); var gRealGreD = gDirSvc.get(NS_GRE_DIR, AUS_Ci.nsIFile);
// Use a custom GRE dir to keep the dist/bin dir clean // Use a custom GRE dir to keep the dist/bin dir clean
var gCustomGreD = do_get_cwd(); // XXXrstrong - Custom GreD is disabled for now since it isn't working on
gCustomGreD.append("app_dir"); // Thunderbird Linux and possibly others.
try { var gCustomGreD = gRealGreD.clone();
//var gCustomGreD = do_get_cwd();
//gCustomGreD.append("app_dir");
//try {
// This will likely fail sporadically on Mac OS X as the removal of the // This will likely fail sporadically on Mac OS X as the removal of the
// updates directory has in the past so wrap it in a try catch // updates directory has in the past so wrap it in a try catch
if (gCustomGreD.exists()) // if (gCustomGreD.exists())
gCustomGreD.remove(true); // gCustomGreD.remove(true);
} //}
catch (e) { //catch (e) {
dump("Unable to remove directory\npath: " + gCustomGreD.path + // dump("Unable to remove directory\npath: " + gCustomGreD.path +
"\nException: " + e + "\n"); // "\nException: " + e + "\n");
} //}
if (!gCustomGreD.exists()) //if (!gCustomGreD.exists())
gCustomGreD.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY); // gCustomGreD.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
var dirProvider = { var dirProvider = {
getFile: function(prop, persistent) { getFile: function(prop, persistent) {
@ -798,10 +802,10 @@ var dirProvider = {
case NS_APP_PROFILE_DIR_STARTUP: case NS_APP_PROFILE_DIR_STARTUP:
persistent.value = true; persistent.value = true;
return gProfD.clone(); return gProfD.clone();
case NS_GRE_DIR: // case NS_GRE_DIR:
case XRE_UPDATE_ROOT_DIR: // case XRE_UPDATE_ROOT_DIR:
persistent.value = true; // persistent.value = true;
return gCustomGreD.clone(); // return gCustomGreD.clone();
} }
return null; return null;
}, },