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

[oemid] If the configuration is broken, complain loudly

Browse Source 
- Adds an InvalidConfiguration value for internal errors

SEE #1136
This commit is contained in:
Adriaan de Groot 2019-05-03 09:00:38 -04:00
parent e0a79f4c0f
commit 5f01a8ccc5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcalamares/Job.h
View File

@ -40,7 +40,8 @@ public:
{ {
NoError = 0, NoError = 0,
GenericError = -1, GenericError = -1,
PythonUncaughtException = 1 PythonUncaughtException = 1,
InvalidConfiguration = 2
} ; } ;
JobResult( const JobResult& rhs ) = delete; JobResult( const JobResult& rhs ) = delete;

13
src/modules/oemid/IDJob.cpp
View File

@ -82,13 +82,12 @@ Calamares::JobResult IDJob::exec()
QString targetFile = QStringLiteral( "oem-id" ); QString targetFile = QStringLiteral( "oem-id" );
QString rootMount = gs->value( "rootMountPoint" ).toString(); QString rootMount = gs->value( "rootMountPoint" ).toString();
static const char noRoot[] = "No rootMountPoint is set."; // Don't bother translating internal errors
static const char yesRoot[] = "rootMountPoint is set:";
QString targetPath;
if ( rootMount.isEmpty() && Calamares::Settings::instance()->doChroot() ) if ( rootMount.isEmpty() && Calamares::Settings::instance()->doChroot() )
cWarning() << Logger::SubEntry << noRoot; return Calamares::JobResult::internalError(
"OEM Batch Identifier",
"No rootMountPoint is set, but a chroot is required. "
"Is there a module before oemid that sets up the partitions?",
Calamares::JobResult::InvalidConfiguration );
return writeId( Calamares::Settings::instance()->doChroot() ? rootMount + targetDir : targetDir, targetFile, m_batchIdentifier ); return writeId( Calamares::Settings::instance()->doChroot() ? rootMount + targetDir : targetDir, targetFile, m_batchIdentifier );
} }