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

[partition] Rename setting to BAIL_OUT

Browse Source 
- unsafe partitioning will bail out (and end the installation)
  if BAIL_OUT is set (previously _LAME).
This commit is contained in:
Adriaan de Groot 2022-02-21 11:56:34 +01:00
parent b1742876fd
commit 62888f7984
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -75,7 +75,7 @@ option( BUILD_SCHEMA_TESTING "Enable schema-validation-tests" ON )
# - DEBUG_FILESYSTEMS does extra logging and checking when looking at # - DEBUG_FILESYSTEMS does extra logging and checking when looking at
# partition configuration. Lists known KPMCore FS types. # partition configuration. Lists known KPMCore FS types.
# - DEBUG_PARTITION_UNSAFE (see partition/CMakeLists.txt) # - DEBUG_PARTITION_UNSAFE (see partition/CMakeLists.txt)
# - DEBUG_PARTITION_LAME (see partition/CMakeLists.txt) # - DEBUG_PARTITION_BAIL_OUT (see partition/CMakeLists.txt)
### USE_* ### USE_*

8
src/modules/partition/CMakeLists.txt
View File

@ -9,10 +9,10 @@
# current disk). Set DEBUG_PARTITION_UNSAFE to allow that (it turns off # current disk). Set DEBUG_PARTITION_UNSAFE to allow that (it turns off
# some filtering of devices). If you **do** allow unsafe partitioning, # some filtering of devices). If you **do** allow unsafe partitioning,
# it will error out at runtime unless you **also** switch **off** # it will error out at runtime unless you **also** switch **off**
# DEBUG_PARTITION_LAME, at which point you are welcome to shoot # DEBUG_PARTITION_BAIL_OUT, at which point you are welcome to shoot
# yourself in the foot. # yourself in the foot.
option( DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF ) option( DEBUG_PARTITION_UNSAFE "Allow unsafe partitioning choices." OFF )
option( DEBUG_PARTITION_LAME "Unsafe partitioning will error out on exec." ON ) option( DEBUG_PARTITION_BAIL_OUT "Unsafe partitioning will error out on exec." ON )
# This is very chatty, useful mostly if you don't know what KPMCore offers. # This is very chatty, useful mostly if you don't know what KPMCore offers.
option( DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF ) option( DEBUG_FILESYSTEMS "Log all available Filesystems from KPMCore." OFF )
@ -21,8 +21,8 @@ include_directories( ${CMAKE_SOURCE_DIR} ) # For 3rdparty
set( _partition_defs ) set( _partition_defs )
if( DEBUG_PARTITION_UNSAFE ) if( DEBUG_PARTITION_UNSAFE )
if( DEBUG_PARTITION_LAME ) if( DEBUG_PARTITION_BAIL_OUT )
list( APPEND _partition_defs DEBUG_PARTITION_LAME ) list( APPEND _partition_defs DEBUG_PARTITION_BAIL_OUT )
endif() endif()
list( APPEND _partition_defs DEBUG_PARTITION_UNSAFE ) list( APPEND _partition_defs DEBUG_PARTITION_UNSAFE )
endif() endif()

2
src/modules/partition/core/DeviceList.cpp
View File

@ -143,7 +143,7 @@ getDevices( DeviceType which )
*/ */
#ifdef DEBUG_PARTITION_UNSAFE #ifdef DEBUG_PARTITION_UNSAFE
cWarning() << "Allowing unsafe partitioning choices." << devices.count() << "candidates."; cWarning() << "Allowing unsafe partitioning choices." << devices.count() << "candidates.";
#ifdef DEBUG_PARTITION_LAME #ifdef DEBUG_PARTITION_BAIL_OUT
cDebug() << Logger::SubEntry << "unsafe partitioning has been lamed, and will fail."; cDebug() << Logger::SubEntry << "unsafe partitioning has been lamed, and will fail.";
#endif #endif

4
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -37,7 +37,7 @@
#include "jobs/ResizeVolumeGroupJob.h" #include "jobs/ResizeVolumeGroupJob.h"
#include "jobs/SetPartitionFlagsJob.h" #include "jobs/SetPartitionFlagsJob.h"
#ifdef DEBUG_PARTITION_LAME #ifdef DEBUG_PARTITION_BAIL_OUT
#include "JobExample.h" #include "JobExample.h"
#endif #endif
#include "partition/PartitionIterator.h" #include "partition/PartitionIterator.h"
@ -622,7 +622,7 @@ PartitionCoreModule::jobs( const Config* config ) const
QList< Device* > devices; QList< Device* > devices;
#ifdef DEBUG_PARTITION_UNSAFE #ifdef DEBUG_PARTITION_UNSAFE
#ifdef DEBUG_PARTITION_LAME #ifdef DEBUG_PARTITION_BAIL_OUT
cDebug() << "Unsafe partitioning is enabled."; cDebug() << "Unsafe partitioning is enabled.";
cDebug() << Logger::SubEntry << "it has been lamed, and will fail."; cDebug() << Logger::SubEntry << "it has been lamed, and will fail.";
lst << Calamares::job_ptr( new Calamares::FailJob( QStringLiteral( "Partition" ) ) ); lst << Calamares::job_ptr( new Calamares::FailJob( QStringLiteral( "Partition" ) ) );

2
src/modules/partition/gui/ChoicePage.cpp
View File

@ -1481,7 +1481,7 @@ ChoicePage::setupActions()
} }
#ifdef DEBUG_PARTITION_UNSAFE #ifdef DEBUG_PARTITION_UNSAFE
#ifdef DEBUG_PARTITION_LAME #ifdef DEBUG_PARTITION_BAIL_OUT
// If things can't be broken, allow all the buttons // If things can't be broken, allow all the buttons
atLeastOneCanBeReplaced = true; atLeastOneCanBeReplaced = true;
atLeastOneCanBeResized = true; atLeastOneCanBeResized = true;