Fix bug in site_host_attributes.

server/site_host_attributes.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging, os, utils
 
 # Host attributes are specified a strings with the format:
 #   <key>{,<value>}?
 #
 # A machine may have a list of strings for attributes like:
@@ skipping 61 matching lines @@
         """
         Create an instance of HostAttribute for the given hostname.
         We look up the host in both the hardcoded configuration and
         the AFE models if they can be found.
         """
         self._add_attributes(_DEFAULT_ATTRIBUTES)
         if host in private_host_attributes:
             self._add_attributes(private_host_attributes[host])
         if has_models:
             host_obj = models.Host.valid_objects.get(hostname=host)
-            self._add_attributes(host_obj.labels.all())
+            self._add_attributes([label.name for label in
+                                  host_obj.labels.all()])
         for key, value in self.__dict__.items():
             logging.info('Host attribute: %s => %s', key, value)
 
 
     def _add_attributes(self, attributes):
         for attribute in attributes:
             splitnames = attribute.split(',')
             value = ','.join(splitnames[1:])
+            if len(splitnames) == 1:
+                continue
             if value == 'True':
                 value = True
             elif value == 'False':
                 value = False
             elif splitnames[1] == 'string':
-                value = ','.join(splitnames[2:])
-            else:
-                log.info('Non-attribute string "%s" is ignored' % attribute)
+                logging.info('Non-attribute string "%s" is ignored' % attribute)
                 continue
             setattr(self, splitnames[0], value)