Merge remote branch 'cros/upstream' into tempbranch3

server/autotest.py

 # Copyright 2007 Google Inc. Released under the GPL v2
 
 import re, os, sys, traceback, subprocess, time, pickle, glob, tempfile
 import logging, getpass
 from autotest_lib.server import installable_object, prebuild, utils
 from autotest_lib.client.common_lib import base_job, log, error, autotemp
 from autotest_lib.client.common_lib import global_config, packages
 from autotest_lib.client.common_lib import utils as client_utils
 
 AUTOTEST_SVN  = 'svn://test.kernel.org/autotest/trunk/client'
@@ skipping 195 matching lines @@
         # make sure there are no files in $AUTODIR/results
         results_path = os.path.join(autodir, 'results')
         host.run('rm -rf %s/*' % utils.sh_escape(results_path),
                  ignore_status=True)
 
         # Fetch the autotest client from the nearest repository
         if use_packaging:
             try:
                 self._install_using_packaging(host, autodir)
                 return
-            except global_config.ConfigError, e:
+            except (error.PackageInstallError, error.AutoservRunError,
+                    global_config.ConfigError), e:
                 logging.info("Could not install autotest using the packaging "
-                             "system: %s",  e)
-            except (error.PackageInstallError, error.AutoservRunError), e:
-                logging.error("Could not install autotest from repos")
+                             "system: %s. Trying other methods",  e)
 
         # try to install from file or directory
         if self.source_material:
             c = global_config.global_config
             supports_autoserv_packaging = c.get_config_value(
                 "PACKAGES", "serve_packages_from_autoserv", type=bool)
             # Copy autotest recursively
             if supports_autoserv_packaging and use_autoserv:
                 self._install_using_send_file(host, autodir)
             else:
@@ skipping 836 matching lines @@
 
         @returns: True if the test passes, False otherwise."""
         at = self._Autotest()
         control_file = ('result = job.run_test(%s)\n'
                         'job.set_state("test_result", result)\n')
         test_args = [repr(test_name)]
         test_args += ['%s=%r' % (k, v) for k, v in dargs.iteritems()]
         control_file %= ', '.join(test_args)
         at.run(control_file, host=self)
         return at.job.get_state('test_result', default=False)