Changeset 90664 in webkit
- Timestamp:
- Jul 8, 2011 1:58:44 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r90659 r90664 1 2011-07-08 Adam Roben <aroben@apple.com> 2 3 Remove commit-log-editor's dependency on Module::Load::Conditional 4 5 This module isn't available in Perl 5.8.8 (the version used on Leopard). 6 7 Fixes <http://webkit.org/b/64198> REGRESSION (r90583): 8 webkitpy.common.checkout.checkout_unittest failing on Leopard 9 10 Reviewed by Daniel Bates. 11 12 * Scripts/commit-log-editor: Use the new loadTermReadKey() function instead of 13 Module::Load::Conditional::can_load. 14 (loadTermReadKey): Added. Tries to load Term::ReadKey and returns true if it's successful. 15 1 16 2011-07-08 Adam Roben <aroben@apple.com> 2 17 -
trunk/Tools/Scripts/commit-log-editor
r90632 r90664 35 35 use File::Spec; 36 36 use FindBin; 37 use Module::Load::Conditional qw(can_load);38 37 use lib $FindBin::Bin; 39 38 use VCSUtils; … … 42 41 sub createCommitMessage(@); 43 42 sub fixEnvironment(); 43 sub loadTermReadKey(); 44 44 sub normalizeLineEndings($$); 45 45 sub patchAuthorshipString($$$); … … 159 159 160 160 my $keepExistingLog = 1; 161 if ($regenerateLog && $existingLog && scalar(@changeLogs) > 0 && can_load(modules=>{ 'Term::ReadKey'=>undef })) {161 if ($regenerateLog && $existingLog && scalar(@changeLogs) > 0 && loadTermReadKey()) { 162 162 print "Existing log message detected, Use 'r' to regenerate log message from ChangeLogs, or any other key to keep the existing message.\n"; 163 163 Term::ReadKey::ReadMode('cbreak'); … … 333 333 } 334 334 335 sub loadTermReadKey() 336 { 337 eval { require Term::ReadKey; }; 338 return !$@; 339 } 340 335 341 sub normalizeLineEndings($$) 336 342 {
Note: See TracChangeset
for help on using the changeset viewer.