Title: [267035] trunk/Tools
- Revision
- 267035
- Author
- [email protected]
- Date
- 2020-09-14 13:22:20 -0700 (Mon, 14 Sep 2020)
Log 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(...).
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (267034 => 267035)
--- trunk/Tools/ChangeLog 2020-09-14 20:17:40 UTC (rev 267034)
+++ trunk/Tools/ChangeLog 2020-09-14 20:22:20 UTC (rev 267035)
@@ -1,3 +1,18 @@
+2020-09-14 Jonathan Bedard <[email protected]>
+
+ [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 <[email protected]>
[WinCairo][MediaFoundation] r264188 introduced linker warning: LNK4199: /DELAYLOAD:mf.dll ignored; no imports found from mf.dll
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (267034 => 267035)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2020-09-14 20:17:40 UTC (rev 267034)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2020-09-14 20:22:20 UTC (rev 267035)
@@ -35,7 +35,7 @@
from webkitcorepy.subprocess_utils import TimeoutExpired, CompletedProcess, run
from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
-version = Version(0, 4, 9)
+version = Version(0, 4, 10)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (267034 => 267035)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2020-09-14 20:17:40 UTC (rev 267034)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2020-09-14 20:22:20 UTC (rev 267035)
@@ -325,7 +325,7 @@
@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
@@ -359,8 +359,8 @@
raise ValueError('{} is an invalid autoinstall directory'.format(directory))
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),
))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
