Pier Angelo Vendrame pushed to branch mullvad-browser-149.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 864b2e0b by Pier Angelo Vendrame at 2026-04-20T14:47:21+02:00 fixup! BB 9173: Change the default Firefox profile directory to be relative. BB 44560: Customize env variables for alternate data directories. In Bug 283779, Mozilla added a couple of environment variables to set custom app data directories. In this patch, we replace their MOZ_ prefix to make sure we do not match any customization users might have done for Firefox, so that we keep the profiles distinct. - - - - - 2 changed files: - python/mozbuild/mozbuild/mach_commands.py - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== python/mozbuild/mozbuild/mach_commands.py ===================================== @@ -2461,22 +2461,22 @@ def _run_desktop( if appdata is True: appdata = tmpdir - extra_env["MOZ_APP_DATA"] = os.path.normpath( + extra_env["BB_APP_DATA"] = os.path.normpath( os.path.join(appdata, "AppData", "Roaming") ) command_context.log( logging.INFO, "run", - {"app_data": extra_env["MOZ_APP_DATA"]}, + {"app_data": extra_env["BB_APP_DATA"]}, "Overriding application data directory to {app_data}", ) - extra_env["MOZ_LOCAL_APP_DATA"] = os.path.normpath( + extra_env["BB_LOCAL_APP_DATA"] = os.path.normpath( os.path.join(appdata, "Local") ) command_context.log( logging.INFO, "run", - {"local_app_data": extra_env["MOZ_LOCAL_APP_DATA"]}, + {"local_app_data": extra_env["BB_LOCAL_APP_DATA"]}, "Overriding local application data directory to {local_app_data}", ) ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1451,9 +1451,9 @@ nsresult nsXREDirProvider::GetSystemExtensionsDirectory(nsIFile** aFile) { nsresult nsXREDirProvider::GetUserDataDirectory(nsIFile** aFile, bool aLocal) { nsCOMPtr<nsIFile> localDir; - nsCOMPtr<nsIFile> customDir = mozilla::GetFileFromEnv("MOZ_APP_DATA"); + nsCOMPtr<nsIFile> customDir = mozilla::GetFileFromEnv("BB_APP_DATA"); nsCOMPtr<nsIFile> customLocalDir = - mozilla::GetFileFromEnv("MOZ_LOCAL_APP_DATA"); + mozilla::GetFileFromEnv("BB_LOCAL_APP_DATA"); if (aLocal && gDataDirProfileLocal) { return gDataDirProfileLocal->Clone(aFile); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/864b... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/864b... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help