Revert "Merge remote branch 'cros/upstream' into tempbranch2"

server/autotest.py

Index: server/autotest.py
diff --git a/server/autotest.py b/server/autotest.py
index eb250952ba7bdd58d565ef230e54e5fd6342e684..f918b27be728dc578f433056ea192a88249f3398 100644
--- a/server/autotest.py
+++ b/server/autotest.py
@@ -213,10 +213,11 @@ class BaseAutotest(installable_object.InstallableObject):
             try:
                 self._install_using_packaging(host, autodir)
                 return
-            except (error.PackageInstallError, error.AutoservRunError,
-                    global_config.ConfigError), e:
+            except global_config.ConfigError, e:
                 logging.info("Could not install autotest using the packaging "
-                             "system: %s. Trying other methods",  e)
+                             "system: %s",  e)
+            except (error.PackageInstallError, error.AutoservRunError), e:
+                logging.error("Could not install autotest from repos")
 
         # try to install from file or directory
         if self.source_material: