August 2025 - tor-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by morgan (＠morgan) 26 Aug '25

26 Aug '25

morgan pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: d19719f4 by Henry Wilkes at 2025-08-26T20:19:41+00:00 fixup! BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. TB 44128: Fix about:logins to be able to hard disable the "new-login-button". - - - - - 3 changed files: - browser/components/aboutlogins/content/aboutLogins.mjs - browser/components/aboutlogins/content/components/login-command-button.mjs - browser/components/aboutlogins/content/components/login-list.mjs Changes: ===================================== browser/components/aboutlogins/content/aboutLogins.mjs ===================================== @@ -27,9 +27,6 @@ const gElements = { ".menuitem-remove-all-logins" ); }, - get createNewLoginButton() { - return this.loginList.shadowRoot.querySelector(".create-login-button"); - }, }; let numberOfLogins = 0; @@ -136,9 +133,7 @@ window.addEventListener("AboutLoginsChromeToContent", event => { gElements.loginList.setSortDirection(event.detail.value.selectedSort); document.documentElement.classList.add("initialized"); gElements.loginList.classList.add("initialized"); - if (!event.detail.value.canCreateLogins) { - gElements.createNewLoginButton.disabled = true; - } + gElements.loginList.canCreateLogins = event.detail.value.canCreateLogins; break; } case "ShowLoginItemError": { ===================================== browser/components/aboutlogins/content/components/login-command-button.mjs ===================================== @@ -48,6 +48,9 @@ export class CreateLoginButton extends MozLitElement { static get properties() { return { disabled: { type: Boolean, reflect: true }, + // Whether the button is disabled no matter if the "disabled" attribute is + // switched. + hardDisabled: { type: Boolean, reflect: true }, }; } @@ -62,7 +65,7 @@ export class CreateLoginButton extends MozLitElement { l10nId: "create-login-button", variant: "icon-button", icon: "chrome://global/skin/icons/plus.svg", - disabled: this.disabled, + disabled: this.disabled || this.hardDisabled, })} `; } ===================================== browser/components/aboutlogins/content/components/login-list.mjs ===================================== @@ -111,6 +111,28 @@ export default class LoginList extends HTMLElement { this._blankLoginListItem.hidden = true; } + /** + * Whether the user can create logins. + * + * @type {boolean} + */ + _canCreateLogins = false; + + get canCreateLogins() { + return this._canCreateLogins; + } + + set canCreateLogins(value) { + this._canCreateLogins = Boolean(value); + this._canCreateLoginsUpdate(); + } + + _canCreateLoginsUpdate() { + if (this._createLoginButton) { + this._createLoginButton.hardDisabled = !this.canCreateLogins; + } + } + connectedCallback() { if (this.shadowRoot) { return; @@ -122,6 +144,7 @@ export default class LoginList extends HTMLElement { this._count = shadowRoot.querySelector(".count"); this._createLoginButton = shadowRoot.querySelector("create-login-button"); + this._canCreateLoginsUpdate(); this._list = shadowRoot.querySelector("ol"); this._list.appendChild(this._blankLoginListItem); this._sortSelect = shadowRoot.querySelector("#login-sort"); @@ -426,7 +449,7 @@ export default class LoginList extends HTMLElement { break; } case "AboutLoginsShowBlankLogin": { - if (!event.defaultPrevented) { + if (!event.defaultPrevented && this.canCreateLogins) { this._selectedGuid = null; this._setListItemAsSelected(this._blankLoginListItem); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/d19… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/d19… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] fixup! BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by morgan (＠morgan) 26 Aug '25

26 Aug '25

morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: e95dea25 by Henry Wilkes at 2025-08-26T20:18:26+00:00 fixup! BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. TB 44128: Fix about:logins to be able to hard disable the "new-login-button". - - - - - 3 changed files: - browser/components/aboutlogins/content/aboutLogins.mjs - browser/components/aboutlogins/content/components/login-command-button.mjs - browser/components/aboutlogins/content/components/login-list.mjs Changes: ===================================== browser/components/aboutlogins/content/aboutLogins.mjs ===================================== @@ -27,9 +27,6 @@ const gElements = { ".menuitem-remove-all-logins" ); }, - get createNewLoginButton() { - return this.loginList.shadowRoot.querySelector(".create-login-button"); - }, }; let numberOfLogins = 0; @@ -136,9 +133,7 @@ window.addEventListener("AboutLoginsChromeToContent", event => { gElements.loginList.setSortDirection(event.detail.value.selectedSort); document.documentElement.classList.add("initialized"); gElements.loginList.classList.add("initialized"); - if (!event.detail.value.canCreateLogins) { - gElements.createNewLoginButton.disabled = true; - } + gElements.loginList.canCreateLogins = event.detail.value.canCreateLogins; break; } case "ShowLoginItemError": { ===================================== browser/components/aboutlogins/content/components/login-command-button.mjs ===================================== @@ -48,6 +48,9 @@ export class CreateLoginButton extends MozLitElement { static get properties() { return { disabled: { type: Boolean, reflect: true }, + // Whether the button is disabled no matter if the "disabled" attribute is + // switched. + hardDisabled: { type: Boolean, reflect: true }, }; } @@ -62,7 +65,7 @@ export class CreateLoginButton extends MozLitElement { l10nId: "create-login-button", variant: "icon-button", icon: "chrome://global/skin/icons/plus.svg", - disabled: this.disabled, + disabled: this.disabled || this.hardDisabled, })} `; } ===================================== browser/components/aboutlogins/content/components/login-list.mjs ===================================== @@ -111,6 +111,28 @@ export default class LoginList extends HTMLElement { this._blankLoginListItem.hidden = true; } + /** + * Whether the user can create logins. + * + * @type {boolean} + */ + _canCreateLogins = false; + + get canCreateLogins() { + return this._canCreateLogins; + } + + set canCreateLogins(value) { + this._canCreateLogins = Boolean(value); + this._canCreateLoginsUpdate(); + } + + _canCreateLoginsUpdate() { + if (this._createLoginButton) { + this._createLoginButton.hardDisabled = !this.canCreateLogins; + } + } + connectedCallback() { if (this.shadowRoot) { return; @@ -122,6 +144,7 @@ export default class LoginList extends HTMLElement { this._count = shadowRoot.querySelector(".count"); this._createLoginButton = shadowRoot.querySelector("create-login-button"); + this._canCreateLoginsUpdate(); this._list = shadowRoot.querySelector("ol"); this._list.appendChild(this._blankLoginListItem); this._sortSelect = shadowRoot.querySelector("#login-sort"); @@ -426,7 +449,7 @@ export default class LoginList extends HTMLElement { break; } case "AboutLoginsShowBlankLogin": { - if (!event.defaultPrevented) { + if (!event.defaultPrevented && this.canCreateLogins) { this._selectedGuid = null; this._setListItemAsSelected(this._blankLoginListItem); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e95dea2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e95dea2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by morgan (＠morgan) 26 Aug '25

26 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 6aaf40e2 by Henry Wilkes at 2025-08-26T20:12:02+00:00 fixup! BB 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. TB 44128: Fix about:logins to be able to hard disable the "new-login-button". - - - - - 3 changed files: - browser/components/aboutlogins/content/aboutLogins.mjs - browser/components/aboutlogins/content/components/login-command-button.mjs - browser/components/aboutlogins/content/components/login-list.mjs Changes: ===================================== browser/components/aboutlogins/content/aboutLogins.mjs ===================================== @@ -27,9 +27,6 @@ const gElements = { ".menuitem-remove-all-logins" ); }, - get createNewLoginButton() { - return this.loginList.shadowRoot.querySelector(".create-login-button"); - }, }; let numberOfLogins = 0; @@ -136,9 +133,7 @@ window.addEventListener("AboutLoginsChromeToContent", event => { gElements.loginList.setSortDirection(event.detail.value.selectedSort); document.documentElement.classList.add("initialized"); gElements.loginList.classList.add("initialized"); - if (!event.detail.value.canCreateLogins) { - gElements.createNewLoginButton.disabled = true; - } + gElements.loginList.canCreateLogins = event.detail.value.canCreateLogins; break; } case "ShowLoginItemError": { ===================================== browser/components/aboutlogins/content/components/login-command-button.mjs ===================================== @@ -48,6 +48,9 @@ export class CreateLoginButton extends MozLitElement { static get properties() { return { disabled: { type: Boolean, reflect: true }, + // Whether the button is disabled no matter if the "disabled" attribute is + // switched. + hardDisabled: { type: Boolean, reflect: true }, }; } @@ -62,7 +65,7 @@ export class CreateLoginButton extends MozLitElement { l10nId: "create-login-button", variant: "icon-button", icon: "chrome://global/skin/icons/plus.svg", - disabled: this.disabled, + disabled: this.disabled || this.hardDisabled, })} `; } ===================================== browser/components/aboutlogins/content/components/login-list.mjs ===================================== @@ -111,6 +111,28 @@ export default class LoginList extends HTMLElement { this._blankLoginListItem.hidden = true; } + /** + * Whether the user can create logins. + * + * @type {boolean} + */ + _canCreateLogins = false; + + get canCreateLogins() { + return this._canCreateLogins; + } + + set canCreateLogins(value) { + this._canCreateLogins = Boolean(value); + this._canCreateLoginsUpdate(); + } + + _canCreateLoginsUpdate() { + if (this._createLoginButton) { + this._createLoginButton.hardDisabled = !this.canCreateLogins; + } + } + connectedCallback() { if (this.shadowRoot) { return; @@ -122,6 +144,7 @@ export default class LoginList extends HTMLElement { this._count = shadowRoot.querySelector(".count"); this._createLoginButton = shadowRoot.querySelector("create-login-button"); + this._canCreateLoginsUpdate(); this._list = shadowRoot.querySelector("ol"); this._list.appendChild(this._blankLoginListItem); this._sortSelect = shadowRoot.querySelector("#login-sort"); @@ -426,7 +449,7 @@ export default class LoginList extends HTMLElement { break; } case "AboutLoginsShowBlankLogin": { - if (!event.defaultPrevented) { + if (!event.defaultPrevented && this.canCreateLogins) { this._selectedGuid = null; this._setListItemAsSelected(this._blankLoginListItem); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6aaf40e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6aaf40e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] TB 44127: Do not show macOS Privacy hint on network error pages
by morgan (＠morgan) 26 Aug '25

26 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: f0150ab6 by hackademix at 2025-08-26T12:08:34+02:00 TB 44127: Do not show macOS Privacy hint on network error pages - - - - - 1 changed file: - toolkit/actors/NetErrorChild.sys.mjs Changes: ===================================== toolkit/actors/NetErrorChild.sys.mjs ===================================== @@ -214,6 +214,9 @@ export class NetErrorChild extends RemotePageChild { } RPMShowOSXLocalNetworkPermissionWarning() { + // Short-circuit per tor-browser#44127 + return false; + /* if (!lazy.AppInfo.isMac) { return false; } @@ -225,5 +228,6 @@ export class NetErrorChild extends RemotePageChild { let version = parseInt(Services.sysinfo.getProperty("version")); // We only show this error on Sequoia or later return version >= 24; + */ } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f0150ab… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f0150ab… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] Bug 41197 - [android] Disable autofill
by brizental (＠brizental) 26 Aug '25

26 Aug '25

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: b2184806 by Beatriz Rizental at 2025-08-25T19:17:01+02:00 Bug 41197 - [android] Disable autofill Firefox is an Autofill service. From the Android docs: > An autofill service is an app that makes it easier for users to fil > out forms by injecting data into the views of other apps. Autofill > services can also retrieve user data from the views in an app and > store it for use at a later time. Autofill services are usually > provided by apps that manage user data, such as password managers. Tor Browser is not an autofill service. All of the autofill backend is disabled at build time, since it lives in application-services. This commit disabled the client side of autofill. - - - - - 2 changed files: - mobile/android/android-components/components/feature/autofill/src/main/java/mozilla/components/feature/autofill/AutofillUseCases.kt - mobile/android/fenix/app/src/main/AndroidManifest.xml Changes: ===================================== mobile/android/android-components/components/feature/autofill/src/main/java/mozilla/components/feature/autofill/AutofillUseCases.kt ===================================== @@ -21,7 +21,7 @@ import mozilla.components.support.base.log.logger.Logger class AutofillUseCases( @VisibleForTesting sdkVersion: Int = Build.VERSION.SDK_INT, ) { - private val isAutofillAvailable = sdkVersion >= Build.VERSION_CODES.O + private val isAutofillAvailable = false private val logger = Logger("AutofillUseCases") /** ===================================== mobile/android/fenix/app/src/main/AndroidManifest.xml ===================================== @@ -683,19 +683,6 @@ android:name=".messaging.NotificationClickedReceiverActivity" android:exported="false" /> - <service android:name=".autofill.AutofillService" - tools:targetApi="o" - android:exported="true" - android:label="@string/app_name" - android:permission="android.permission.BIND_AUTOFILL_SERVICE"> - <intent-filter> - <action android:name="android.service.autofill.AutofillService"/> - </intent-filter> - <meta-data - android:name="android.autofill" - android:resource="@xml/autofill_configuration" /> - </service> - <service android:name=".media.MediaSessionService" android:foregroundServiceType="mediaPlayback" android:exported="false" /> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b218480… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b218480… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! BB 42037: Disable about:firefoxview page
by morgan (＠morgan) 25 Aug '25

25 Aug '25

morgan pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 6e9e7cba by Henry Wilkes at 2025-08-25T12:27:15+00:00 fixup! BB 42037: Disable about:firefoxview page TB 43726: Drop comments about resolved bugzilla issues. - - - - - 1 changed file: - browser/themes/shared/tabbrowser/tabs.css Changes: ===================================== browser/themes/shared/tabbrowser/tabs.css ===================================== @@ -1734,9 +1734,7 @@ tab-group { /* about:firefoxview is disabled in Base Browser. See tor-browser#42037. * Therefore we always hide #firefox-view-button, regardless of private * browsing. Here we only want to draw the border if there is a non-hidden - * toolbar item before the tabs. - * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In - * these cases we want to keep our selector as-is. */ + * toolbar item before the tabs. */ :root :is( toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button) @@ -1747,9 +1745,7 @@ tab-group { } /* about:firefoxview is disabled in Base Browser. Always hide the toolbar button - * and menu item regardless of private browsing. See tor-browser#42037. - * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In - * these cases we want to keep our selector as-is. */ + * and menu item regardless of private browsing. See tor-browser#42037. */ #firefox-view-button, #menu_openFirefoxView { display: none; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6e9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6e9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] fixup! BB 42037: Disable about:firefoxview page
by morgan (＠morgan) 25 Aug '25

25 Aug '25

morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 5f57ce1b by Henry Wilkes at 2025-08-25T12:22:43+00:00 fixup! BB 42037: Disable about:firefoxview page TB 43726: Drop comments about resolved bugzilla issues. - - - - - 1 changed file: - browser/themes/shared/tabbrowser/tabs.css Changes: ===================================== browser/themes/shared/tabbrowser/tabs.css ===================================== @@ -1734,9 +1734,7 @@ tab-group { /* about:firefoxview is disabled in Base Browser. See tor-browser#42037. * Therefore we always hide #firefox-view-button, regardless of private * browsing. Here we only want to draw the border if there is a non-hidden - * toolbar item before the tabs. - * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In - * these cases we want to keep our selector as-is. */ + * toolbar item before the tabs. */ :root :is( toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button) @@ -1747,9 +1745,7 @@ tab-group { } /* about:firefoxview is disabled in Base Browser. Always hide the toolbar button - * and menu item regardless of private browsing. See tor-browser#42037. - * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In - * these cases we want to keep our selector as-is. */ + * and menu item regardless of private browsing. See tor-browser#42037. */ #firefox-view-button, #menu_openFirefoxView { display: none; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f57ce1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5f57ce1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! BB 42037: Disable about:firefoxview page
by morgan (＠morgan) 25 Aug '25

25 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 3d5e7a2f by Henry Wilkes at 2025-08-25T11:17:59+01:00 fixup! BB 42037: Disable about:firefoxview page TB 43726: Drop comments about resolved bugzilla issues. - - - - - 1 changed file: - browser/themes/shared/tabbrowser/tabs.css Changes: ===================================== browser/themes/shared/tabbrowser/tabs.css ===================================== @@ -1734,9 +1734,7 @@ tab-group { /* about:firefoxview is disabled in Base Browser. See tor-browser#42037. * Therefore we always hide #firefox-view-button, regardless of private * browsing. Here we only want to draw the border if there is a non-hidden - * toolbar item before the tabs. - * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In - * these cases we want to keep our selector as-is. */ + * toolbar item before the tabs. */ :root :is( toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button) @@ -1747,9 +1745,7 @@ tab-group { } /* about:firefoxview is disabled in Base Browser. Always hide the toolbar button - * and menu item regardless of private browsing. See tor-browser#42037. - * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In - * these cases we want to keep our selector as-is. */ + * and menu item regardless of private browsing. See tor-browser#42037. */ #firefox-view-button, #menu_openFirefoxView { display: none; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d5e7a2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d5e7a2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 26408: Remove redundant check of macos code signature in update_responses
by morgan (＠morgan) 25 Aug '25

25 Aug '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4e6d2832 by Nicolas Vigier at 2025-08-21T16:44:40+02:00 Bug 26408: Remove redundant check of macos code signature in update_responses When CHECK_CODESIGNATURE_EXISTS is set (we set it when re-generating incrementals for macos during the signing process), we were checking that both the mar files from previous and new versions are code signed. Checking that the mar file from the previous version is code signed is not necessary since it is checked just before even when the CHECK_CODESIGNATURE_EXISTS is not set. - - - - - 1 changed file: - tools/update-responses/update_responses Changes: ===================================== tools/update-responses/update_responses ===================================== @@ -261,11 +261,11 @@ sub create_incremental_mar { && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { exit_error "Missing code signature in $from_version while creating $mar_file"; } + # Check that the version we update to is code signed (when re-generating + # incrementals for macos during the signing process) if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { - unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" - && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { - exit_error "Missing code signature while creating $mar_file"; - } + exit_error "Missing code signature while creating $mar_file" + unless -f "$tmpdir/B/Contents/_CodeSignature/CodeResources"; } local $ENV{MOZ_PRODUCT_VERSION} = $new_version; local $ENV{MAR_CHANNEL_ID} = get_config($config, $new_version, $os, 'mar_channel_id'); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 2 commits: fixup! BB 43564: Modify ./mach bootstrap for Base Browser
by brizental (＠brizental) 21 Aug '25

21 Aug '25

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 6b3510e9 by Beatriz Rizental at 2025-08-21T18:32:02+02:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser - - - - - 7b6cea75 by Beatriz Rizental at 2025-08-21T18:32:02+02:00 fixup! TB 43564: Modify ./mach bootstrap for Tor Browser - - - - - 1 changed file: - python/mozbuild/mozbuild/backend/base.py Changes: ===================================== python/mozbuild/mozbuild/backend/base.py ===================================== @@ -246,7 +246,7 @@ class BuildBackend(LoggingMixin): app = config.substs["MOZ_BUILD_APP"] noscript_target_filename = "{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" - noscript_location = Path(config.substs["NOSCRIPT"]) + noscript_location = config.substs.get("NOSCRIPT") def _infallible_symlink(src, dst): try: @@ -280,30 +280,30 @@ class BuildBackend(LoggingMixin): "fonts": tbdir / "fonts", } - fonts_location = Path(config.substs["TOR_BROWSER_FONTS"]) - if fonts_location.is_dir(): + fonts_location = config.substs.get("TOR_BROWSER_FONTS") + if fonts_location: self.log( logging.INFO, "_setup_tor_browser_environment", { - "fonts_location": str(fonts_location), + "fonts_location": fonts_location, "fonts_target": str(paths["fonts"]), }, "Creating symlink for fonts files from {fonts_location} to {fonts_target}", ) - for file in fonts_location.iterdir(): + for file in Path(fonts_location).iterdir(): target = paths["fonts"] / file.name _infallible_symlink(file, target) # Set up NoScript extension - if noscript_location.is_file(): + if noscript_location: noscript_target = paths["exts"] / noscript_target_filename self.log( logging.INFO, "_setup_tor_browser_environment", { - "noscript_location": str(noscript_location), + "noscript_location": noscript_location, "noscript_target": str(noscript_target), }, "Creating symlink for NoScript from {noscript_location} to {noscript_target}", @@ -312,8 +312,12 @@ class BuildBackend(LoggingMixin): paths["exts"].mkdir(parents=True, exist_ok=True) _infallible_symlink(noscript_location, noscript_target) - expert_bundle_location = Path(config.substs["TOR_EXPERT_BUNDLE"]) - if expert_bundle_location.is_dir(): + expert_bundle_location = config.substs.get("TOR_EXPERT_BUNDLE") + if expert_bundle_location: + expert_bundle_location = Path(expert_bundle_location) + if not expert_bundle_location.is_dir(): + return + self.log( logging.INFO, "_setup_tor_browser_environment", @@ -353,9 +357,10 @@ class BuildBackend(LoggingMixin): _infallible_symlink(file, target) # Setup Tor binary - for item in (expert_bundle_location / "tor").iterdir(): + for item in Path(expert_bundle_location / "tor").iterdir(): target = paths["tor_bin"] / item.name - if target.is_file(): + + if item.is_file(): _infallible_symlink(item, target) # Set up licenses View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1827f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1827f… You're receiving this email because of your account on gitlab.torproject.org.

1 0