| 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 self.host.environ['HOME'] = self._original_home | 143 self.host.environ['HOME'] = self._original_home |
| 144 | 144 |
| 145 def _check_apache_install(self): | 145 def _check_apache_install(self): |
| 146 result = self._check_file_exists(self.path_to_apache(), "apache2") | 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 | 147 result = self._check_file_exists(self.path_to_apache_config_file(), "apa
che2 config file") and result |
| 148 if not result: | 148 if not result: |
| 149 _log.error(' Please install using: "sudo apt-get install apache2
libapache2-mod-php5"') | 149 _log.error(' Please install using: "sudo apt-get install apache2
libapache2-mod-php5"') |
| 150 _log.error('') | 150 _log.error('') |
| 151 return result | 151 return result |
| 152 | 152 |
| 153 def _wdiff_missing_message(self): | |
| 154 return 'wdiff is not installed; please install using "sudo apt-get insta
ll wdiff"' | |
| 155 | |
| 156 def _path_to_driver(self, target=None): | 153 def _path_to_driver(self, target=None): |
| 157 binary_name = self.driver_name() | 154 binary_name = self.driver_name() |
| 158 return self._build_path_with_target(target, binary_name) | 155 return self._build_path_with_target(target, binary_name) |
| OLD | NEW |