| OLD | NEW |
| 1 import os, shutil, re, logging | 1 import os, shutil, re, logging |
| 2 | 2 |
| 3 from autotest_lib.client.common_lib import utils | 3 from autotest_lib.client.common_lib import utils |
| 4 from autotest_lib.client.bin import base_sysinfo | 4 from autotest_lib.client.bin import base_sysinfo |
| 5 from autotest_lib.client.bin import chromeos_constants | 5 from autotest_lib.client.cros import constants as chromeos_constants |
| 6 | 6 |
| 7 | 7 |
| 8 logfile = base_sysinfo.logfile | 8 logfile = base_sysinfo.logfile |
| 9 command = base_sysinfo.command | 9 command = base_sysinfo.command |
| 10 | 10 |
| 11 | 11 |
| 12 class logdir(base_sysinfo.loggable): | 12 class logdir(base_sysinfo.loggable): |
| 13 def __init__(self, directory): | 13 def __init__(self, directory): |
| 14 super(logdir, self).__init__(directory, log_in_keyval=False) | 14 super(logdir, self).__init__(directory, log_in_keyval=False) |
| 15 self.dir = directory | 15 self.dir = directory |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 for lsb_key in lsb_dict.keys(): | 90 for lsb_key in lsb_dict.keys(): |
| 91 # Special handling for build number | 91 # Special handling for build number |
| 92 if lsb_key == "CHROMEOS_RELEASE_DESCRIPTION": | 92 if lsb_key == "CHROMEOS_RELEASE_DESCRIPTION": |
| 93 keyval["CHROMEOS_BUILD"] = ( | 93 keyval["CHROMEOS_BUILD"] = ( |
| 94 lsb_dict[lsb_key].rstrip(")").split(" ")[3]) | 94 lsb_dict[lsb_key].rstrip(")").split(" ")[3]) |
| 95 keyval[lsb_key] = lsb_dict[lsb_key] | 95 keyval[lsb_key] = lsb_dict[lsb_key] |
| 96 | 96 |
| 97 # return the updated keyvals | 97 # return the updated keyvals |
| 98 return keyval | 98 return keyval |
| OLD | NEW |