зеркало из https://github.com/mozilla/gecko-dev.git
Bug 465190: Don't log errors when we can't create the global install locations. r=robstrong
This commit is contained in:
Родитель
27405c798f
Коммит
8670fe716a
|
@ -1071,8 +1071,8 @@ function DirectoryInstallLocation(name, location, restricted, priority, independ
|
||||||
location.create(Ci.nsILocalFile.DIRECTORY_TYPE, 0775);
|
location.create(Ci.nsILocalFile.DIRECTORY_TYPE, 0775);
|
||||||
}
|
}
|
||||||
catch (e) {
|
catch (e) {
|
||||||
ERROR("DirectoryInstallLocation: failed to create location " +
|
LOG("DirectoryInstallLocation: failed to create location " +
|
||||||
" directory = " + location.path + ", exception = " + e + "\n");
|
" directory = " + location.path + ", exception = " + e + "\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1201,6 +1201,11 @@ DirectoryInstallLocation.prototype = {
|
||||||
if (this._canAccess != null)
|
if (this._canAccess != null)
|
||||||
return this._canAccess;
|
return this._canAccess;
|
||||||
|
|
||||||
|
if (!this.location.exists()) {
|
||||||
|
this._canAccess = false;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
var testFile = this.location;
|
var testFile = this.location;
|
||||||
testFile.append("Access Privileges Test");
|
testFile.append("Access Privileges Test");
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
/* ***** BEGIN LICENSE BLOCK *****
|
||||||
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
*
|
||||||
|
* The contents of this file are subject to the Mozilla Public License Version
|
||||||
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
* http://www.mozilla.org/MPL/
|
||||||
|
*
|
||||||
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
* for the specific language governing rights and limitations under the
|
||||||
|
* License.
|
||||||
|
*
|
||||||
|
* The Original Code is mozilla.org code.
|
||||||
|
*
|
||||||
|
* The Initial Developer of the Original Code is
|
||||||
|
* Dave Townsend <dtownsend@oxymoronical.com>.
|
||||||
|
*
|
||||||
|
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||||
|
* the Initial Developer. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Contributor(s):
|
||||||
|
*
|
||||||
|
* Alternatively, the contents of this file may be used under the terms of
|
||||||
|
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
* of those above. If you wish to allow use of your version of this file only
|
||||||
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
* use your version of this file under the terms of the MPL, indicate your
|
||||||
|
* decision by deleting the provisions above and replace them with the notice
|
||||||
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
* the provisions above, a recipient may use your version of this file under
|
||||||
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK *****
|
||||||
|
*/
|
||||||
|
|
||||||
|
var installLocation = gProfD.clone();
|
||||||
|
installLocation.append("baddir");
|
||||||
|
installLocation.create(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0664);
|
||||||
|
|
||||||
|
var dirProvider2 = {
|
||||||
|
getFile: function(prop, persistent) {
|
||||||
|
persistent.value = true;
|
||||||
|
if (prop == "XREUSysExt")
|
||||||
|
return installLocation.clone();
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
QueryInterface: function(iid) {
|
||||||
|
if (iid.equals(Components.interfaces.nsIDirectoryServiceProvider) ||
|
||||||
|
iid.equals(Components.interfaces.nsISupports)) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
gDirSvc.QueryInterface(Components.interfaces.nsIDirectoryService)
|
||||||
|
.registerProvider(dirProvider2);
|
||||||
|
|
||||||
|
function run_test()
|
||||||
|
{
|
||||||
|
var log = gProfD.clone();
|
||||||
|
log.append("extensions.log");
|
||||||
|
do_check_false(log.exists());
|
||||||
|
|
||||||
|
// Setup for test
|
||||||
|
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
|
||||||
|
|
||||||
|
startupEM();
|
||||||
|
do_check_false(log.exists());
|
||||||
|
}
|
Загрузка…
Ссылка в новой задаче