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

fix regression in v2.94.0 wrt windows string escape on rxt command #1139

Merged
merged 1 commit into from
Oct 12, 2021
Merged

fix regression in v2.94.0 wrt windows string escape on rxt command #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/rez/tests/test_shells.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,10 @@ def test_rcfile(self):
self.assertEqual(_stdout(p), "Hello Rez World!")
os.remove(path)

# TODO get these shells working again
# TODO fix cmd shell command string escape
# as per https://github.com/nerdvegas/rez/pull/1130, then remove this
# exclusion
#
@per_available_shell(exclude=["cmd"])
@install_dependent()
def test_rez_env_output(self):
Expand Down
2 changes: 1 addition & 1 deletion src/rez/utils/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


# Update this value to version up Rez. Do not place anything else in this file.
_rez_version = "2.95.2"
_rez_version = "2.95.3"


# Copyright 2013-2016 Allan Johns.
Expand Down
8 changes: 6 additions & 2 deletions src/rezplugins/shell/cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,12 @@ def get_all_key_tokens(cls, key):

@classmethod
def join(cls, command):
inst = cls()
return ' '.join(inst.escape_string(x) for x in command)
# TODO: This needs to be properly fixed, see other shell impls
# at https://github.com/nerdvegas/rez/pull/1130
#
# TODO: This may disappear in future [1]
# [1] https://bugs.python.org/issue10838
return subprocess.list2cmdline(command)

@classmethod
def line_terminator(cls):
Expand Down