Merge remote-tracking branch 'origin/master' into jerry-sandbox

This commit is contained in:
Jerry (Xinyu Hou)
2015-06-02 15:30:33 -07:00
3 changed files with 13 additions and 12 deletions

View File

@@ -194,13 +194,7 @@ QString PluginManager::getPluginUrl(const QString& pluginName)
process.start(program, args);
bool success = process.waitForStarted();
if (!success || !process.waitForFinished())
{
emit error(tr("Could not get Linux package type."));
return "";
}
bool isDeb = (process.exitCode() == 0);
bool isDeb = (success && process.waitForFinished() & (process.exitCode() == 0));
int arch = getProcessorArch();
if (arch == kProcessorArchLinux32) {