| OLD | NEW |
| 1 # coding: utf-8 | 1 # coding: utf-8 |
| 2 | 2 |
| 3 # This file is part of the Adblock Plus web scripts, | 3 # This file is part of the Adblock Plus web scripts, |
| 4 # Copyright (C) 2006-2014 Eyeo GmbH | 4 # Copyright (C) 2006-2014 Eyeo GmbH |
| 5 # | 5 # |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 6 # Adblock Plus is free software: you can redistribute it and/or modify |
| 7 # it under the terms of the GNU General Public License version 3 as | 7 # it under the terms of the GNU General Public License version 3 as |
| 8 # published by the Free Software Foundation. | 8 # published by the Free Software Foundation. |
| 9 # | 9 # |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 10 # Adblock Plus is distributed in the hope that it will be useful, |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 else: | 161 else: |
| 162 self.type = 'gecko' | 162 self.type = 'gecko' |
| 163 | 163 |
| 164 if self.type == 'gecko': | 164 if self.type == 'gecko': |
| 165 self.packageSuffix = '.xpi' | 165 self.packageSuffix = '.xpi' |
| 166 elif self.type == 'chrome' or self.type == 'opera': | 166 elif self.type == 'chrome' or self.type == 'opera': |
| 167 self.packageSuffix = '.crx' | 167 self.packageSuffix = '.crx' |
| 168 elif self.type == 'safari': | 168 elif self.type == 'safari': |
| 169 self.packageSuffix = '.safariextz' | 169 self.packageSuffix = '.safariextz' |
| 170 elif self.type == 'ie': | 170 elif self.type == 'ie': |
| 171 self.packageSuffix = '-x64.msi' | 171 self.packageSuffix = '.exe' |
| 172 elif self.type == 'android': | 172 elif self.type == 'android': |
| 173 self.packageSuffix = '.apk' | 173 self.packageSuffix = '.apk' |
| 174 | 174 |
| 175 if self.nightlyConfig and not self.nightlyConfig.has_section(self.repository
Name): | 175 if self.nightlyConfig and not self.nightlyConfig.has_section(self.repository
Name): |
| 176 self.nightlyConfig.add_section(self.repositoryName) | 176 self.nightlyConfig.add_section(self.repositoryName) |
| 177 | 177 |
| 178 def __str__(self): | 178 def __str__(self): |
| 179 """ | 179 """ |
| 180 Provides a string representation of this configuration | 180 Provides a string representation of this configuration |
| 181 """ | 181 """ |
| (...skipping 27 matching lines...) Expand all Loading... |
| 209 except M2Crypto.X509.X509Error: | 209 except M2Crypto.X509.X509Error: |
| 210 raise Exception('No safari developer certificate found in chain') | 210 raise Exception('No safari developer certificate found in chain') |
| 211 | 211 |
| 212 subject = cert.get_subject() | 212 subject = cert.get_subject() |
| 213 for entry in subject.get_entries_by_nid(subject.nid['CN']): | 213 for entry in subject.get_entries_by_nid(subject.nid['CN']): |
| 214 m = re.match(r'Safari Developer: \((.*?)\)', entry.get_data().as_text()) | 214 m = re.match(r'Safari Developer: \((.*?)\)', entry.get_data().as_text()) |
| 215 if m: | 215 if m: |
| 216 return m.group(1) | 216 return m.group(1) |
| 217 finally: | 217 finally: |
| 218 bio.close() | 218 bio.close() |
| OLD | NEW |