diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebKitTools/Scripts/webkitpy/common/system | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/common/system')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py b/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py index 2dbc1e8..4e6d3da 100644 --- a/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py +++ b/WebKitTools/Scripts/webkitpy/common/system/filesystem_mock.py @@ -49,7 +49,16 @@ class MockFileSystem(object): return False def join(self, *comps): - return '/'.join(comps) + # os.path.join ignores trailing slashes on components (i.e. + # join('foo/', 'bar') and join('foo', 'bar') produce the same result), + # we emulate that behavior. + trimmed_comps = [] + for comp in comps: + if len(comp) and comp[-1] == '/': + trimmed_comps.append(comp[0:-1]) + else: + trimmed_comps.append(comp) + return '/'.join(trimmed_comps) def maybe_make_directory(self, *path): # FIXME: Implement such that subsequent calls to isdir() work? |