Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1294)

Unified Diff: src/scripts/image_to_live.sh

Issue 1986012: Only kill the dev server when it is started by image_to_live process. (Closed) Base URL: ssh://git@chromiumos-git/chromeos
Patch Set: patch 1 Created 10 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/image_to_live.sh
diff --git a/src/scripts/image_to_live.sh b/src/scripts/image_to_live.sh
index c75e3684acbcf75c0a755b6157b22631feb102b5..755807507de4f8bb88810965289bd3546baa6dae 100755
--- a/src/scripts/image_to_live.sh
+++ b/src/scripts/image_to_live.sh
@@ -25,14 +25,16 @@ DEFINE_integer devserver_port 8080 \
DEFINE_string update_url "" "Full url of an update image"
function kill_all_devservers {
+ echo "Killing dev server."
# Using ! here to avoid exiting with set -e is insufficient, so use
# || true instead.
sudo pkill -f devserver\.py || true
}
function cleanup {
- echo "Killing dev server."
- kill_all_devservers
+ if [ -z "${FLAGS_update_url}" ]; then
+ kill_all_devservers
+ fi
cleanup_remote_access
rm -rf "${TMP}"
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698