| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 continue | 135 continue |
| 136 fs.copyfile(original_path, fs.join(dummy_home, filename)) | 136 fs.copyfile(original_path, fs.join(dummy_home, filename)) |
| 137 | 137 |
| 138 def _clean_up_dummy_home_dir(self): | 138 def _clean_up_dummy_home_dir(self): |
| 139 """Cleans up the dummy dir and resets the HOME environment variable.""" | 139 """Cleans up the dummy dir and resets the HOME environment variable.""" |
| 140 dummy_home = self.host.environ['HOME'] | 140 dummy_home = self.host.environ['HOME'] |
| 141 assert dummy_home != self._original_home | 141 assert dummy_home != self._original_home |
| 142 self._filesystem.rmtree(dummy_home) | 142 self._filesystem.rmtree(dummy_home) |
| 143 self.host.environ['HOME'] = self._original_home | 143 self.host.environ['HOME'] = self._original_home |
| 144 | 144 |
| 145 def _check_apache_install(self): | |
| 146 result = self._check_file_exists(self.path_to_apache(), "apache2") | |
| 147 result = self._check_file_exists(self.path_to_apache_config_file(), "apa
che2 config file") and result | |
| 148 if not result: | |
| 149 _log.error(' Please install using: "sudo apt-get install apache2
libapache2-mod-php5"') | |
| 150 _log.error('') | |
| 151 return result | |
| 152 | |
| 153 def _path_to_driver(self, target=None): | 145 def _path_to_driver(self, target=None): |
| 154 binary_name = self.driver_name() | 146 binary_name = self.driver_name() |
| 155 return self._build_path_with_target(target, binary_name) | 147 return self._build_path_with_target(target, binary_name) |
| OLD | NEW |