Title: [294535] trunk/Tools/Scripts/libraries
Revision
294535
Author
dp...@igalia.com
Date
2022-05-20 00:14:48 -0700 (Fri, 20 May 2022)

Log Message

[git-webkit] Question 'Are you sure want to setup a fork?' always returns 'Yes'

Reviewed by Jonathan Bedard.

When the response of the user is an empty string, function 'Terminal.choose'
always returns the first option.

The reason for that is a 'startswith' comparison of an option with an empty
string. This comparison is always true, thus the first option is selected
instead of the default option.

Canonical link: https://commits.webkit.org/250790@main

Modified Paths

Diff

Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py (294534 => 294535)


--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py	2022-05-20 06:51:32 UTC (rev 294534)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py	2022-05-20 07:14:48 UTC (rev 294535)
@@ -65,7 +65,7 @@
                 if index >= 0 and index < len(options):
                     response = options[index]
 
-            if not strict:
+            if not strict and len(response) > 0:
                 for option in options:
                     if option.lower().startswith(response.lower()):
                         response = option

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py (294534 => 294535)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py	2022-05-20 06:51:32 UTC (rev 294534)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py	2022-05-20 07:14:48 UTC (rev 294535)
@@ -441,7 +441,7 @@
             else:
                 sys.stderr.write(warning)
 
-        if not forking:
+        if not forking or forking == 'No':
             return result
 
         if cls.github(args, rmt, **kwargs):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to