napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[logUpload] fixes

Browse Source
This commit is contained in:
Anubhav Choudhary 2021-03-29 13:22:56 -06:00
parent 6726a926a4
commit 6a6557e320
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/branding/default/branding.desc
View File

@ -233,4 +233,4 @@ slideshowAPI: 2
uploadServer : uploadServer :
type : "fiche" type : "fiche"
url : "http://termbin.com:9999" url : "http://termbin.com:9999"
sizeLimit : 20 sizeLimit : -1

2
src/libcalamaresui/ViewManager.cpp
View File

@ -144,7 +144,7 @@ void
ViewManager::onInstallationFailed( const QString& message, const QString& details ) ViewManager::onInstallationFailed( const QString& message, const QString& details )
{ {
bool shouldOfferWebPaste bool shouldOfferWebPaste
= std::get<2>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None; = std::get<0>(Calamares::Branding::instance()->uploadServer()) != Calamares::Branding::UploadServerType::None;
cError() << "Installation failed:" << message; cError() << "Installation failed:" << message;
cDebug() << Logger::SubEntry << "- message:" << message; cDebug() << Logger::SubEntry << "- message:" << message;

2
src/libcalamaresui/utils/Paste.cpp
View File

@ -40,7 +40,7 @@ logFileContents( qint64 sizeLimit )
return QByteArray(); return QByteArray();
} }
QFileInfo fi( pasteSourceFile ); QFileInfo fi( pasteSourceFile );
sizeLimit *= 1024; //For KiB to bytes sizeLimit = ( sizeLimit < 0 ) ? 1024*1024 : sizeLimit * 1024; //For KiB to bytes
cDebug() << "Log upload size limit was set to " << sizeLimit << " bytes"; cDebug() << "Log upload size limit was set to " << sizeLimit << " bytes";
if ( fi.size() > sizeLimit and sizeLimit > 0 ) if ( fi.size() > sizeLimit and sizeLimit > 0 )
{ {