Title: [281155] trunk/Tools
Revision
281155
Author
[email protected]
Date
2021-08-17 12:11:24 -0700 (Tue, 17 Aug 2021)

Log Message

[GLIB] Avoid getting stuck searching for revision in some cases
https://bugs.webkit.org/show_bug.cgi?id=229199

Reviewed by Philippe Normand.

With an empty .git/svn, the `git svn info` command might get stuck.

* glib/apply-build-revision-to-files.py:
(get_build_revision):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (281154 => 281155)


--- trunk/Tools/ChangeLog	2021-08-17 19:02:46 UTC (rev 281154)
+++ trunk/Tools/ChangeLog	2021-08-17 19:11:24 UTC (rev 281155)
@@ -1,3 +1,15 @@
+2021-08-17  Lauro Moura  <[email protected]>
+
+        [GLIB] Avoid getting stuck searching for revision in some cases
+        https://bugs.webkit.org/show_bug.cgi?id=229199
+
+        Reviewed by Philippe Normand.
+
+        With an empty .git/svn, the `git svn info` command might get stuck.
+
+        * glib/apply-build-revision-to-files.py:
+        (get_build_revision):
+
 2021-08-16  Lauro Moura  <[email protected]>
 
         REGRESSION(r281079) [GLIB] API test WebKitWebsiteData/deviceidhashsalt is not waiting for title change

Modified: trunk/Tools/glib/apply-build-revision-to-files.py (281154 => 281155)


--- trunk/Tools/glib/apply-build-revision-to-files.py	2021-08-17 19:02:46 UTC (rev 281154)
+++ trunk/Tools/glib/apply-build-revision-to-files.py	2021-08-17 19:11:24 UTC (rev 281155)
@@ -27,7 +27,8 @@
 def get_build_revision():
     revision = "unknown"
     with open(os.devnull, 'w') as devnull:
-        if os.path.isdir(os.path.join('.git', 'svn')):
+        gitsvn = os.path.join('.git', 'svn')
+        if os.path.isdir(gitsvn) and os.listdir(gitsvn):
             for line in subprocess.check_output(("git", "svn", "info"), stderr=devnull).splitlines():
                 parsed = line.split(b':')
                 key = parsed[0]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to