Summary: | [BlackBerry] Add a early return in buildCMakeProjectOrExit() | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Ming Xie <mxie> | ||||||
Component: | WebKit BlackBerry | Assignee: | Nobody <webkit-unassigned> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | rwlbuis, tonikitoo, webkit.review.bot | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Attachments: |
|
Description
Ming Xie
2012-10-01 11:32:08 PDT
Created attachment 166513 [details]
Patch
Attachment 166513 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitdi..." exit_code: 1
Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5]
Total errors found: 1 in 2 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 166515 [details]
Patch
Comment on attachment 166515 [details]
Patch
LGTM.
Comment on attachment 166515 [details] Patch Rejecting attachment 166515 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 [chromium] ASSERT that the embedder has set a default locale When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/14124035 Comment on attachment 166515 [details] Patch Clearing flags on attachment: 166515 Committed r130066: <http://trac.webkit.org/changeset/130066> All reviewed patches have been landed. Closing bug. |