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

…urns '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
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py

@@ -65,7 +65,7 @@ def choose(cls, prompt, options=None, default=None, strict=False, numbered=False
                 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

Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py

@@ -441,7 +441,7 @@ def git(cls, args, repository, additional_setup=None, hooks=None, **kwargs):
             else:
                 sys.stderr.write(warning)
 
-        if not forking:
+        if not forking or forking == 'No':
             return result
 
         if cls.github(args, rmt, **kwargs):