зеркало из https://github.com/mozilla/gecko-dev.git
Merge m-c to a CLOSED TREE m-i
MozReview-Commit-ID: BrsSHyBv1nf
This commit is contained in:
Коммит
8b48aeb2ba
|
@ -427,6 +427,7 @@ class VirtualenvMixin(object):
|
|||
self.run_command(virtualenv + virtualenv_options + [venv_path],
|
||||
cwd=dirs['abs_work_dir'],
|
||||
error_list=VirtualenvErrorList,
|
||||
partial_env={'VIRTUALENV_NO_DOWNLOAD': "1"},
|
||||
halt_on_failure=True)
|
||||
|
||||
# Resolve the pip version so we can conditionally do things if we have
|
||||
|
|
|
@ -1046,8 +1046,7 @@ nsThread::HasPendingEvents(bool* aResult)
|
|||
|
||||
{
|
||||
MutexAutoLock lock(mLock);
|
||||
*aResult = mEvents->HasPendingEvent(lock) ||
|
||||
mIdleEvents.HasPendingEvent(lock);
|
||||
*aResult = mEvents->HasPendingEvent(lock);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче