Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backout f583132674d5 due to failing tests

Browse Source
This commit is contained in:
Brad Lassey 2012-01-26 01:42:38 -05:00
parent 4abd30558d
commit 95e1d93652
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
toolkit/mozapps/extensions/XPIProvider.jsm
View File

@ -200,24 +200,6 @@ var gIDTest = /^(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\
return this[aName];
})
}, this);
/**
* Sets permissions on a file
*
* @param aFile
* The file or directory to operate on.
* @param aPermissions
* The permisions to set
*/
function setFilePermissions(aFile, aPermissions) {
try {
aFile.permissions = aPermissions;
}
catch (e) {
WARN("Failed to set permissions " + aPermissions.toString(8) + " on " +
aFile.path, e);
}
}
/**
* A safe way to install a file or the contents of a directory to a new
@ -297,7 +279,7 @@ SafeInstallOperation.prototype = {
// The directory should be empty by this point. If it isn't this will throw
// and all of the operations will be rolled back
try {
setPermissions(aDirectory, FileUtils.PERMS_DIRECTORY);
aDirectory.permissions = FileUtils.PERMS_DIRECTORY;
aDirectory.remove(false);
}
catch (e) {
@ -1103,13 +1085,7 @@ function extractFiles(aZipFile, aDir) {
continue;
zipReader.extract(entryName, target);
try {
target.permissions |= FileUtils.PERMS_FILE;
}
catch (e) {
WARN("Failed to set permissions " + aPermissions.toString(8) + " on " +
target.path, e);
}
target.permissions |= FileUtils.PERMS_FILE;
}
}
finally {
@ -1276,7 +1252,7 @@ function cleanStagingDir(aDir, aLeafNames) {
}
try {
setPermissions(aDir, FileUtils.PERMS_DIRECTORY);
aDir.permissions = FileUtils.PERMS_DIRECTORY;
aDir.remove(false);
}
catch (e) {
@ -1292,8 +1268,8 @@ function cleanStagingDir(aDir, aLeafNames) {
* The nsIFile to remove
*/
function recursiveRemove(aFile) {
setPermissions(aFile, aFile.isDirectory() ? FileUtils.PERMS_DIRECTORY
: FileUtils.PERMS_FILE);
aFile.permissions = aFile.isDirectory() ? FileUtils.PERMS_DIRECTORY
: FileUtils.PERMS_FILE;
try {
aFile.remove(true);
@ -8100,11 +8076,7 @@ DirectoryInstallLocation.prototype = {
let newFile = this._directory.clone().QueryInterface(Ci.nsILocalFile);
newFile.append(aSource.leafName);
try {
newFile.lastModifiedTime = Date.now();
} catch (e) {
WARN("failed to set lastModifiedTime on " + newFile.path, e);
}
newFile.lastModifiedTime = Date.now();
this._FileToIDMap[newFile.path] = aId;
this._IDToFileMap[aId] = newFile;