Changeset 267035 in webkit

Timestamp:

Sep 14, 2020 1:22:20 PM (4 years ago)

Author:

Jonathan Bedard

Message:

[webkitcorepy] Disable AutoInstaller with environment variable (Follow-up fix)
​https://bugs.webkit.org/show_bug.cgi?id=216396
<rdar://problem/68680933>

Unreviewed follow-up fix.

r267019 accidently landed without the support of r267019.

• Scripts/libraries/webkitcorepy/webkitcorepy/init.py: Bump version.
• Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:

(AutoInstall.enabled): Add False and No to the list of environment variables which resolve to 'False'.
(AutoInstall.set_directory): Use AutoInstall.log instead of print(...).

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-14  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitcorepy] Disable AutoInstaller with environment variable (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=216396
+        <rdar://problem/68680933>
+
+        Unreviewed follow-up fix.
+
+        r267019 accidently landed without the support of r267019.
+
+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+        (AutoInstall.enabled): Add False and No to the list of environment variables which resolve to 'False'.
+        (AutoInstall.set_directory): Use AutoInstall.log instead of print(...).
+
 2020-09-14  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py

@@ -36 +36 @@
 from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
 
-version = Version(0, 4, 9)
+version = Version(0, 4, 10)
 
 from webkitcorepy.autoinstall import Package, AutoInstall

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py

@@ -326 +326 @@
     @classmethod
     def enabled(cls):
-        if os.environ.get(cls.DISABLE_ENV_VAR) not in ['0', 'FALSE', 'false', 'NO', 'no', None]:
+        if os.environ.get(cls.DISABLE_ENV_VAR) not in ['0', 'FALSE', 'False', 'false', 'NO', 'No', 'no', None]:
             return False
         return True if cls.directory else None
@@ -360 +360 @@
 
         if cls.enabled() is False:
-            print('Request to set autoinstall directory to {}'.format(directory))
-            print('Environment variable {}={} overriding request'.format(
+            AutoInstall.log('Request to set autoinstall directory to {}'.format(directory))
+            AutoInstall.log('Environment variable {}={} overriding request'.format(
                 cls.DISABLE_ENV_VAR,
                 os.environ.get(cls.DISABLE_ENV_VAR),