Skip to content

Fixing bug that user is replaced anywhere in the line #159

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

Merged
vsoch merged 1 commit into from
May 3, 2020
Merged

Fixing bug that user is replaced anywhere in the line #159

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
singularity on pypi), and the versions here will coincide with these releases.

## [master](https://github.com/singularityhub/singularity-cli/tree/master)
- USER regular expression should check for USER at start of line (0.0.80)
- add singularity options parameters to send to singularity (0.0.79)
- add support for library:// urls (0.0.78)
- instance stop with timeout argument (0.0.77)
Expand Down
4 changes: 2 additions & 2 deletions spython/main/parse/writers/singularity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ def finish_section(section, name):
# Convert USER lines to change user
lines = []
for line in section:
if "USER" in line:
username = line.replace("USER", "").rstrip()
if re.search("^USER", line):
username = line.replace("USER", "", 1).rstrip()
line = "su - %s" % username + " # " + line
lines.append(line)

Expand Down
2 changes: 1 addition & 1 deletion spython/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.


__version__ = "0.0.79"
__version__ = "0.0.80"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "vsochat@stanford.edu"
NAME = "spython"
Expand Down