Title: [280478] trunk/Tools
- Revision
- 280478
- Author
- jbed...@apple.com
- Date
- 2021-07-30 09:35:11 -0700 (Fri, 30 Jul 2021)
Log Message
[git-webkit] Not all platforms support more -F
https://bugs.webkit.org/show_bug.cgi?id=228619
<rdar://problem/81296290>
Reviewed by Aakash Jain.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py:
(FilteredCommand.pager): Only pass -F to more on Darwin.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (280477 => 280478)
--- trunk/Tools/ChangeLog 2021-07-30 16:21:43 UTC (rev 280477)
+++ trunk/Tools/ChangeLog 2021-07-30 16:35:11 UTC (rev 280478)
@@ -1,3 +1,16 @@
+2021-07-30 Jonathan Bedard <jbed...@apple.com>
+
+ [git-webkit] Not all platforms support more -F
+ https://bugs.webkit.org/show_bug.cgi?id=228619
+ <rdar://problem/81296290>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py:
+ (FilteredCommand.pager): Only pass -F to more on Darwin.
+
2021-07-29 Carlos Alberto Lopez Perez <clo...@igalia.com>
[WPE][GTK] build broken with python2 after r280382
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (280477 => 280478)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-07-30 16:21:43 UTC (rev 280477)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-07-30 16:35:11 UTC (rev 280478)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='1.0.2',
+ version='1.0.3',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (280477 => 280478)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-07-30 16:21:43 UTC (rev 280477)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-07-30 16:35:11 UTC (rev 280478)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(1, 0, 2)
+version = Version(1, 0, 3)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py (280477 => 280478)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py 2021-07-30 16:21:43 UTC (rev 280477)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py 2021-07-30 16:35:11 UTC (rev 280478)
@@ -21,6 +21,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import os
+import platform
import re
import subprocess
import sys
@@ -120,7 +121,7 @@
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)
- more = subprocess.Popen([which('more'), '-F'], stdin=child.stdout)
+ more = subprocess.Popen([which('more')] + ['-F'] if platform.system() == 'Darwin' else [], stdin=child.stdout)
try:
while more.poll() is None and not child.poll():
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
