[jhbuild] use os.sep instead of '/' in utils/fileutils.py
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] use os.sep instead of '/' in utils/fileutils.py
- Date: Thu, 16 Feb 2012 22:56:31 +0000 (UTC)
commit 7a696397a957713c8e0f13856bdc23724be30249
Author: Marcin Wojdyr <wojdyr gmail com>
Date: Wed Feb 15 17:33:05 2012 +0000
use os.sep instead of '/' in utils/fileutils.py
This is needed to make Windows/MSYS build work.
https://bugzilla.gnome.org/show_bug.cgi?id=670154
jhbuild/utils/fileutils.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/jhbuild/utils/fileutils.py b/jhbuild/utils/fileutils.py
index b78e230..f3acc5a 100644
--- a/jhbuild/utils/fileutils.py
+++ b/jhbuild/utils/fileutils.py
@@ -33,7 +33,7 @@ def _accumulate_dirtree_contents_recurse(path, contents):
# Only add if the directory is empty, otherwise, its existence
# is implicit.
if previous_len == new_len:
- contents.append(subpath + '/')
+ contents.append(subpath + os.sep)
else:
contents.append(subpath)
@@ -42,8 +42,8 @@ def accumulate_dirtree_contents(path):
in the returned list is relative to the root path."""
contents = []
_accumulate_dirtree_contents_recurse(path, contents)
- if not path.endswith('/'):
- path = path + '/'
+ if not path.endswith(os.sep):
+ path = path + os.sep
pathlen = len(path)
for i,subpath in enumerate(contents):
assert subpath.startswith(path)
@@ -80,8 +80,8 @@ Returns a list, where each item is a 2-tuple:
def filter_files_by_prefix(config, file_paths):
"""Return the set of files in file_paths that are inside the prefix."""
canon_prefix = config.prefix
- if not canon_prefix.endswith('/'):
- canon_prefix = canon_prefix + '/'
+ if not canon_prefix.endswith(os.sep):
+ canon_prefix = canon_prefix + os.sep
result = []
for path in file_paths:
if path == canon_prefix or (not path.startswith(canon_prefix)):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]