commit 6ab7962a0cc0a7e90afa10757a8d2d1abcfbf357
author Chris Sosa <sosa@chromium.org> Tue Aug 21 13:11:35 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Aug 21 19:09:28 2012 -0700
tree c33c64366ae0184ccd1a981a3bdecd8c0a47edc6
parent bdecc54d67efa669833c7bd0559c7b2761ef0421

Kill off unused/deprecated client_prefix option in devserver.

BUG=chromium-os:33753
TEST=Unittests + ran image_to_live.sh on local device.

Change-Id: I00aee6799d4d3070b1c62521a12cc55de435b3b1
Reviewed-on: https://gerrit.chromium.org/gerrit/31036
Commit-Ready: Chris Sosa <sosa@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>

autoupdate_unittest.py

diff --git a/autoupdate_unittest.py b/autoupdate_unittest.py
index 317dc42..2302cf4 100755
--- a/autoupdate_unittest.py
+++ b/autoupdate_unittest.py
@@ -60,7 +60,6 @@
     dummy = autoupdate.Autoupdate(root_dir=None,
                                   static_dir=self.static_image_dir,
                                   port=self.port)
-    dummy.client_prefix = 'ChromeOSUpdateEngine'
     return dummy
 
   def testGetRightSignedDeltaPayloadDir(self):

devserver.py

diff --git a/devserver.py b/devserver.py
index e3e48dd..9590d6e 100755
--- a/devserver.py
+++ b/devserver.py
@@ -440,10 +440,7 @@
   parser.add_option('--board', dest='board',
                     help='When pre-generating update, board for latest image.')
   parser.add_option('--clear_cache', action='store_true', default=False,
-                    help='Clear out all cached udpates and exit')
-  parser.add_option('--client_prefix', dest='client_prefix_deprecated',
-                    help='No longer used.  It is still here so we don\'t break '
-                    'scripts that used it.', default='')
+                    help='Clear out all cached updates and exit')
   parser.add_option('--critical_update', dest='critical_update',
                     action='store_true', default=False,
                     help='Present update payload as critical')
@@ -528,10 +525,6 @@
   else:
     os.makedirs(cache_dir)
 
-  if options.client_prefix_deprecated:
-    cherrypy.log('The --client_prefix argument is DEPRECATED, '
-                 'and is no longer needed.', 'DEVSERVER')
-
   cherrypy.log('Data dir is %s' % options.data_dir, 'DEVSERVER')
   cherrypy.log('Source root is %s' % root_dir, 'DEVSERVER')
   cherrypy.log('Serving from %s' % static_dir, 'DEVSERVER')

devserver_unittest.py

diff --git a/devserver_unittest.py b/devserver_unittest.py
index e97517b..bfcd85c 100755
--- a/devserver_unittest.py
+++ b/devserver_unittest.py
@@ -78,7 +78,6 @@
         'python',
         os.path.join(base_dir, 'devserver.py'),
         '--validate_factory_config',
-        '--client_prefix', TEST_CLIENT_PREFIX,
         '--factory_config', self.factory_config,
     ]
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
@@ -92,7 +91,6 @@
         'python',
         os.path.join(base_dir, 'devserver.py'),
         'devserver.py',
-        '--client_prefix', TEST_CLIENT_PREFIX,
         '--factory_config', self.factory_config,
     ]
     if data_dir:

host/image_to_live.sh

diff --git a/host/image_to_live.sh b/host/image_to_live.sh
index decf401..33bea56 100755
--- a/host/image_to_live.sh
+++ b/host/image_to_live.sh
@@ -157,7 +157,6 @@
 
   info "Starting devserver with flags ${devserver_flags}"
   cros_sdk -- sudo sh -c "start_devserver ${devserver_flags} \
-       --client_prefix=ChromeOSUpdateEngine \
        --board=${FLAGS_board} \
        --port=${FLAGS_devserver_port} > ${FLAGS_server_log} 2>&1" &