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

[users] Missing ! makes install always fail

Browse Source 
FIXES #1483
This commit is contained in:
Adriaan de Groot 2020-08-10 18:37:08 +02:00
parent 31cfdf926c
commit e9f2c57442
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamares/utils/Permissions.h
View File

@ -61,6 +61,8 @@ public:
/** @brief Sets the file-access @p mode of @p path /** @brief Sets the file-access @p mode of @p path
* *
* Pass a path that is relative (or absolute) in the **host** system. * Pass a path that is relative (or absolute) in the **host** system.
*
* @return @c true on success
*/ */
static bool apply( const QString& path, int mode ); static bool apply( const QString& path, int mode );
/** @brief Do both chmod and chown on @p path /** @brief Do both chmod and chown on @p path
@ -72,6 +74,8 @@ public:
* *
* For this call, the names are interpreted in the **host** system. * For this call, the names are interpreted in the **host** system.
* Pass a path that is relative (or absolute) in the **host** system. * Pass a path that is relative (or absolute) in the **host** system.
*
* @return @c true on success of **both** operations
*/ */
static bool apply( const QString& path, const Permissions& p ); static bool apply( const QString& path, const Permissions& p );
/// Convenience method for apply(const QString&, const Permissions& ) /// Convenience method for apply(const QString&, const Permissions& )

2
src/modules/users/CreateUserJob.cpp
View File

@ -177,7 +177,7 @@ CreateUserJob::exec()
if ( fileResult ) if ( fileResult )
{ {
if ( CalamaresUtils::Permissions::apply( fileResult.path(), 0440 ) ) if ( !CalamaresUtils::Permissions::apply( fileResult.path(), 0440 ) )
{ {
return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) ); return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) );
} }