Merge remote branch 'autotest-upstream/master' into autotest-merge

server/autotest.py

Index: server/autotest.py
diff --git a/server/autotest.py b/server/autotest.py
index 74a76c724091ee970b82385518711b3ee0ab95ab..8591efd26b30c30c08327f3f3950ac91424c198b 100644
--- a/server/autotest.py
+++ b/server/autotest.py
@@ -119,6 +119,14 @@ class BaseAutotest(installable_object.InstallableObject):
                 ', '.join(client_autodir_paths))
 
 
+    def get_fetch_location(self):
+        c = global_config.global_config
+        repos = c.get_config_value("PACKAGES", 'fetch_location', type=list,
+                                   default=[])
+        repos.reverse()
+        return repos
+
+
     def install(self, host=None, autodir=None):
         self._install(host=host, autodir=autodir)
 
@@ -133,10 +141,7 @@ class BaseAutotest(installable_object.InstallableObject):
 
 
     def _install_using_packaging(self, host, autodir):
-        c = global_config.global_config
-        repos = c.get_config_value("PACKAGES", 'fetch_location', type=list,
-                                   default=[])
-        repos.reverse()
+        repos = self.get_fetch_location()
         if not repos:
             raise error.PackageInstallError("No repos to install an "
                                             "autotest client from")
@@ -361,9 +366,7 @@ class BaseAutotest(installable_object.InstallableObject):
         # If the packaging system is being used, add the repository list.
         repos = None
         try:
-            c = global_config.global_config
-            repos = c.get_config_value("PACKAGES", 'fetch_location', type=list)
-            repos.reverse()  # high priority packages should be added last
+            repos = self.get_fetch_location()
             pkgmgr = packages.PackageManager('autotest', hostname=host.hostname,
                                              repo_urls=repos)
             prologue_lines.append('job.add_repository(%s)\n' % repos)
@@ -1001,7 +1004,7 @@ class client_logger(object):
         """Injects a WARN message into the current status logging stream."""
         timestamp = int(time.time())
         if self.job.warning_manager.is_valid(timestamp, warning_type):
-            self.job.record('WARN', None, None, {}, msg)
+            self.job.record('WARN', None, None, msg)
 
 
     def write(self, data):