Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle bytes when using gitpython with python3.x #54900

Merged
merged 11 commits into from
Jan 4, 2020
Merged

Handle bytes when using gitpython with python3.x #54900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c87ffb2
Use Byte stream for gitpython
vin01 Oct 5, 2019
ddc969c
Copy symlinks as symlinks in dest tree for tests
vin01 Oct 5, 2019
5f74b78
Merge branch 'master' into fix/fileserver-file-list
vin01 Oct 8, 2019
d21acf0
Merge branch 'master' into fix/fileserver-file-list
vin01 Oct 17, 2019
4dfb4a9
Merge branch 'master' into fix/fileserver-file-list
vin01 Dec 4, 2019
bd1142b
Merge branch 'master' into fix/fileserver-file-list
vin01 Dec 6, 2019
8d5d062
Merge branch 'master' into fix/fileserver-file-list
vin01 Dec 16, 2019
bb67941
Merge branch 'master' into fix/fileserver-file-list
vin01 Dec 17, 2019
ed8cdf9
Merge branch 'master' into fix/fileserver-file-list
waynew Dec 27, 2019
bd1c479
Merge branch 'master' into fix/fileserver-file-list
vin01 Jan 2, 2020
8c59653
Merge branch 'master' into fix/fileserver-file-list
vin01 Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions salt/utils/gitfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,10 +1295,10 @@ def file_list(self, tgt_env):
file_path = add_mountpoint(relpath(file_blob.path))
files.add(file_path)
if stat.S_ISLNK(file_blob.mode):
stream = six.StringIO()
stream = six.BytesIO()
file_blob.stream_data(stream)
stream.seek(0)
link_tgt = stream.read()
link_tgt = salt.utils.stringutils.to_str(stream.read())
stream.close()
symlinks[file_path] = link_tgt
return files, symlinks
Expand All @@ -1325,10 +1325,10 @@ def find_file(self, path, tgt_env):
# this path's object ID will be the target of the
# symlink. Follow the symlink and set path to the
# location indicated in the blob data.
stream = six.StringIO()
stream = six.BytesIO()
file_blob.stream_data(stream)
stream.seek(0)
link_tgt = stream.read()
link_tgt = salt.utils.stringutils.to_str(stream.read())
stream.close()
path = salt.utils.path.join(
os.path.dirname(path), link_tgt, use_posixpath=True)
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/fileserver/test_gitfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,8 @@ def setUpClass(cls):

shutil.copytree(
salt.ext.six.text_type(RUNTIME_VARS.BASE_FILES),
salt.ext.six.text_type(cls.tmp_repo_dir + '/')
salt.ext.six.text_type(cls.tmp_repo_dir + '/'),
symlinks=True
)

repo = git.Repo.init(cls.tmp_repo_dir)
Expand Down