[tor-commits] [tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 1246614 - Check if system add-ons directory exists before trying to clean it. r=mossop

[gk at torproject.org]

commit ecf19e655e6f6b94c311f3c69e56fea31bdb4185
Author: Frank-Rainer Grahl <frgrahl at gmx.net>
Date:   Sun Feb 21 05:45:00 2016 +0100

    Bug 1246614 - Check if system add-ons directory exists before trying to clean it. r=mossop
    
    --HG--
    extra : rebase_source : 44545607f4434a8ad03cdc59306e02517056d42c
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 94c33ea..ca51ae5 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -8023,6 +8023,12 @@ Object.assign(SystemAddonInstallLocation.prototype, {
    * to cleanup again next time.
    */
   cleanDirectories: Task.async(function*() {
+
+    // System add-ons directory does not exist
+    if (!(yield OS.File.exists(this._baseDir.path))) {
+      return;
+    }
+
     let iterator;
     try {
       iterator = new OS.File.DirectoryIterator(this._baseDir.path);