Title: [168717] releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py
- Revision
- 168717
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:31:02 -0700 (Tue, 13 May 2014)
Log Message
Merge 165174 - [GTK][CMake] Tarball is created with wrong tarball paths
https://bugs.webkit.org/show_bug.cgi?id=129496
Reviewed by Daniel Bates.
* gtk/make-dist.py:
(Manifest.__init__): I inadvertently inverted the logic of these checks when
landing the original patch with some suggestions from the reviewer. With the
checks corrected, the tarball path is constructed properly.
Conflicts:
Tools/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py (168716 => 168717)
--- releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py 2014-05-13 19:30:52 UTC (rev 168716)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/make-dist.py 2014-05-13 19:31:02 UTC (rev 168717)
@@ -120,9 +120,9 @@
self.build_root = os.path.abspath(build_root)
# Normalize the tarball root so that it starts and ends with a slash.
- if self.tarball_root.endswith('/'):
+ if not self.tarball_root.endswith('/'):
self.tarball_root = self.tarball_root + '/'
- if self.tarball_root.startswith('/'):
+ if not self.tarball_root.startswith('/'):
self.tarball_root = '/' + self.tarball_root
with open(manifest_filename, 'r') as file:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
