lib/cros_vm_lib.sh - Issue 6877015: Add combine_stdout_stderr as well as make success less verbose.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/cros_vm_lib.sh

Issue 6877015: Add combine_stdout_stderr as well as make success less verbose. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master

Patch Set: Cleanup Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: lib/cros_vm_lib.sh

diff --git a/lib/cros_vm_lib.sh b/lib/cros_vm_lib.sh

index 525729db0fba0671182ad192d06bf5e0cb9caf88..bbbf338bb40c1f3b85affc43b6594840b2ea50d7 100644

--- a/lib/cros_vm_lib.sh

+++ b/lib/cros_vm_lib.sh

@@ -31,7 +31,6 @@ function blocking_kill() {

local timeout=1

sudo kill -$2 $1

while ps -p $1 > /dev/null && [ ${timeout} -le $3 ]; do

- warn "Process still running, sleeping for ${timeout}"

sleep ${timeout}

timeout=$((timeout*2))

done

@@ -129,7 +128,6 @@ function stop_kvm() {

echo "Stopping the KVM instance" >&2

local pid=$(get_pid)

if [ -n "${pid}" ]; then

- echo "Killing ${pid}" >&2

blocking_kill ${pid} 1 16 || blocking_kill 9 1

sudo rm "${KVM_PID_FILE}"

else

« no previous file with comments | « lib/cros_build_lib.py ('k') | no next file » | no next file with comments »