host/start_devserver - Issue 6646052: Remove --client_prefix argument and check.

Side by Side Diff

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

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

Side by Side Diff: host/start_devserver

Issue 6646052: Remove --client_prefix argument and check. (Closed) Base URL: http://git.chromium.org/git/dev-util.git@master

Patch Set: Added deprecation warning Created 9 years, 9 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « devserver_test.py ('k') | no next file » | no next file with comments »

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2	2

3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.	3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.

4 # Use of this source code is governed by a BSD-style license that can be	4 # Use of this source code is governed by a BSD-style license that can be

5 # found in the LICENSE file.	5 # found in the LICENSE file.

6	6

7 # Start the Dev Server after making sure we are running under a chroot.	7 # Start the Dev Server after making sure we are running under a chroot.

8	8

9 # --- BEGIN COMMON.SH BOILERPLATE ---	9 # --- BEGIN COMMON.SH BOILERPLATE ---

10 # Load common CrOS utilities. Inside the chroot this file is installed in	10 # Load common CrOS utilities. Inside the chroot this file is installed in

(...skipping 14 matching lines...) Expand all Loading...
25	25

26 find_common_sh	26 find_common_sh

27 . "${SCRIPT_ROOT}/common.sh" \|\| (echo "Unable to load common.sh" && exit 1)	27 . "${SCRIPT_ROOT}/common.sh" \|\| (echo "Unable to load common.sh" && exit 1)

28 # --- END COMMON.SH BOILERPLATE ---	28 # --- END COMMON.SH BOILERPLATE ---

29	29

30 # Script must be run inside the chroot if not in 'always serve' mode.	30 # Script must be run inside the chroot if not in 'always serve' mode.

31 if [[ "$1" != "--archive_dir" ]]; then	31 if [[ "$1" != "--archive_dir" ]]; then

32 restart_in_chroot_if_needed "$@"	32 restart_in_chroot_if_needed "$@"

33 fi	33 fi

34	34

35 # Temporary workaround: to start devserver for update engine, pass in args

36 # --client_prefix ChromeOSUpdateEngine

37

38 # Set PKG_INSTALL_MASK if it's not set already.	35 # Set PKG_INSTALL_MASK if it's not set already.

39 if [ -z "${PKG_INSTALL_MASK+x}" ]; then	36 if [ -z "${PKG_INSTALL_MASK+x}" ]; then

40 export PKG_INSTALL_MASK="${DEFAULT_INSTALL_MASK}"	37 export PKG_INSTALL_MASK="${DEFAULT_INSTALL_MASK}"

41 fi	38 fi

42 echo PKG_INSTALL_MASK=$PKG_INSTALL_MASK	39 echo PKG_INSTALL_MASK=$PKG_INSTALL_MASK

43	40

44 python /usr/bin/devserver.py "$@"	41 python /usr/bin/devserver.py "$@"

OLD	NEW