Differential D324

Handle spaces in arguments correctly.
ClosedAll Users
Actions

Authored by aquamatthias on Dec 13 2016, 9:31 AM.

Tags

None

Subscribers

jenkins, marathon-team

Details

Reviewers

lukas
jeschkies

Commits

rMARATHONf582e7c9bf5a: Handle spaces in arguments correctly.
rMARATHON85a32314d6c6: Handle spaces in arguments correctly.
rMARATHONd3351eac37c5: Cherry-picked Handle spaces in arguments correctly (#4887)
rMARATHONee6318241010: Cherry-picked Handle spaces in arguments correctly
rMARATHONdc4a60f03bc1: Handle spaces in arguments correctly.

Test Plan

Start marathon via this script with spaces in arguments.

Diff Detail

Repository

rMARATHON marathon

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

aquamatthias retitled this revision from to Handle spaces in arguments correctly..Dec 13 2016, 9:31 AM

aquamatthias updated this object.

aquamatthias edited the test plan for this revision. (Show Details)

aquamatthias added reviewers: lukas, jeschkies.

Herald added a subscriber: marathon-team. · View Herald TranscriptDec 13 2016, 9:31 AM

LGTM

This revision is now accepted and ready to land.Dec 13 2016, 9:51 AM

Build is green https://jenkins.mesosphere.com/service/jenkins/job/public-test-marathon-phabricator/695/ for more details.

jeschkies accepted this revision.Dec 13 2016, 12:05 PM

Closed by commit rMARATHON85a32314d6c6: Handle spaces in arguments correctly. (authored by aquamatthias). · Explain WhyDec 13 2016, 12:08 PM

This revision was automatically updated to reflect the committed changes.

aquamatthias mentioned this in D322: update changelog for 1.4.0-rc-2 and 1.4.0-rc-3.Dec 13 2016, 5:59 PM

Revision Contents

			Path	Packages
M			bin/marathon-framework (4 lines)

Diff 1251

bin/marathon-framework

Show First 20 Lines • Show All 110 Lines • ▼ Show 20 Line(s)
111	111		if [[ "${cmd[@]} $@" =~ .--no[_-]logger. ]]
112	112		then
113	113		local clean_cmd=()
114	114		for i in "${cmd[@]}" "$@"; do
115	115		if [[ "${i}" != "--no-logger" ]] && [[ "${i}" != "--no_logger" ]]; then
116	116		clean_cmd+=( "${i}" )
117	117		fi
118	118		done
119			cmd_to_env $clean_cmd
	119		cmd_to_env "${clean_cmd[@]}"
120	120		run_jar
121	121		else
122			cmd_to_env $cmd
	122		cmd_to_env "${cmd[@]}"
123	123		logged marathon run_jar "$@"
124	124		fi
125	125		}
126	126
127	127		function run_jar {
128	128		local log_format='%2$s%5$s%6$s%n' # Class name, message, exception
129	129
130	130		# if running as root and open file limit less than 8192 raise the limit
Show All 35 Lines