brizental pushed to branch tor-browser-128.10.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • python/mach/mach/telemetry.py
    ... ... @@ -277,6 +277,7 @@ def prompt_telemetry_message_contributor():
    277 277
     
    
    278 278
     def initialize_telemetry_setting(settings, topsrcdir: str, state_dir: str):
    
    279 279
         """Enables telemetry for employees or prompts the user."""
    
    280
    +    return
    
    280 281
         # If the user doesn't care about telemetry for this invocation, then
    
    281 282
         # don't make requests to Bugzilla and/or prompt for whether the
    
    282 283
         # user wants to opt-in.
    

  • python/sites/mach.txt
    ... ... @@ -96,7 +96,7 @@ vendored:third_party/python/wheel
    96 96
     vendored:third_party/python/zipp
    
    97 97
     # glean-sdk may not be installable if a wheel isn't available
    
    98 98
     # and it has to be built from source.
    
    99
    -pypi-optional:glean-sdk==60.1.1:telemetry will not be collected
    
    99
    +# pypi-optional:glean-sdk==60.1.1:telemetry will not be collected
    
    100 100
     # Mach gracefully handles the case where `psutil` is unavailable.
    
    101 101
     # We aren't (yet) able to pin packages in automation, so we have to
    
    102 102
     # support down to the oldest locally-installed version (5.4.2).