This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch aevri/win32_minimal in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit c2a4ba35ce71dba56a36cc8fd246f1bcca908791 Author: Angelos Evripiotis <[email protected]> AuthorDate: Tue Apr 2 13:36:29 2019 +0100 WIP: win32: ImportElement - fix separators --- src/buildstream/plugins/elements/import.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/buildstream/plugins/elements/import.py b/src/buildstream/plugins/elements/import.py index 9568bd0..103dafd 100644 --- a/src/buildstream/plugins/elements/import.py +++ b/src/buildstream/plugins/elements/import.py @@ -81,10 +81,10 @@ class ImportElement(Element): outputdir = rootdir.descend('output', create=True) # The directory to grab - inputdir = inputdir.descend(*self.source.strip(os.sep).split(os.sep)) + inputdir = inputdir.descend(*self.source.strip('/').split('/')) # The output target directory - outputdir = outputdir.descend(*self.target.strip(os.sep).split(os.sep), create=True) + outputdir = outputdir.descend(*self.target.strip('/').split('/'), create=True) if inputdir.is_empty(): raise ElementError("{}: No files were found inside directory '{}'" @@ -94,7 +94,7 @@ class ImportElement(Element): outputdir.import_files(inputdir) # And we're done - return '/output' + return os.sep + 'output' def generate_script(self): build_root = self.get_variable('build-root')
