Title: [291934] trunk/Tools
Revision
291934
Author
[email protected]
Date
2022-03-26 02:17:21 -0700 (Sat, 26 Mar 2022)

Log Message

[WPE][GTK] Dist/distcheck targets fail due to Python error
https://bugs.webkit.org/show_bug.cgi?id=238394

Reviewed by Philippe Normand.

* Scripts/make-dist:
(Directory.list_files_in_version_control): Ensure that data read from pipes is converted to
strings by specifying text="ascii", as it seems safe to assume that files listed by Git will
not contain non-ASCII characters. While at it, make the function return a set to speed up
lookups.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (291933 => 291934)


--- trunk/Tools/ChangeLog	2022-03-26 05:26:02 UTC (rev 291933)
+++ trunk/Tools/ChangeLog	2022-03-26 09:17:21 UTC (rev 291934)
@@ -1,3 +1,16 @@
+2022-03-26  Adrian Perez de Castro  <[email protected]>
+
+        [WPE][GTK] Dist/distcheck targets fail due to Python error
+        https://bugs.webkit.org/show_bug.cgi?id=238394
+
+        Reviewed by Philippe Normand.
+
+        * Scripts/make-dist:
+        (Directory.list_files_in_version_control): Ensure that data read from pipes is converted to
+        strings by specifying text="ascii", as it seems safe to assume that files listed by Git will
+        not contain non-ASCII characters. While at it, make the function return a set to speed up
+        lookups.
+
 2022-03-25  Wenson Hsieh  <[email protected]>
 
         Enable PGO when building for release and production

Modified: trunk/Tools/Scripts/make-dist (291933 => 291934)


--- trunk/Tools/Scripts/make-dist	2022-03-26 05:26:02 UTC (rev 291933)
+++ trunk/Tools/Scripts/make-dist	2022-03-26 09:17:21 UTC (rev 291934)
@@ -105,11 +105,11 @@
 
     def list_files_in_version_control(self):
         # FIXME: Only git is supported for now.
-        p = subprocess.Popen(['git', 'ls-tree', '-r', '--name-only', 'HEAD', self.source_root], stdout=subprocess.PIPE)
+        p = subprocess.Popen(['git', 'ls-tree', '-r', '--name-only', 'HEAD', self.source_root], stdout=subprocess.PIPE, text="ascii")
         out = p.communicate()[0]
         if not out:
             return []
-        return out.rstrip('\n').split('\n')
+        return frozenset(out.splitlines())
 
     def should_skip_file(self, path):
         return path not in self.files_in_version_control
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to