Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
automatic_updates
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
automatic_updates
Commits
8943a18c
Commit
8943a18c
authored
1 year ago
by
Adam G-H
Committed by
Adam G-H
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
typos
parent
54ce0eac
No related branches found
No related tags found
1 merge request
!900
Issue #3363938: Package Manager should ignore default.settings.php and default.services.yml
This commit is part of merge request
!900
. Comments created here will be created in the context of that merge request.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
package_manager/src/PathExcluder/SiteConfigurationExcluder.php
+3
-3
3 additions, 3 deletions
...ge_manager/src/PathExcluder/SiteConfigurationExcluder.php
with
3 additions
and
3 deletions
package_manager/src/PathExcluder/SiteConfigurationExcluder.php
+
3
−
3
Edit
View file @
8943a18c
...
@@ -90,8 +90,8 @@ class SiteConfigurationExcluder implements EventSubscriberInterface {
...
@@ -90,8 +90,8 @@ class SiteConfigurationExcluder implements EventSubscriberInterface {
* The event being handled.
* The event being handled.
*
*
* @throws \Drupal\Core\File\Exception\FileException
* @throws \Drupal\Core\File\Exception\FileException
* If the permissions of
the
either the live or staged `sites/default`
* If the permissions of either the live or staged `sites/default`
cannot
*
cannot
be determined, or cannot be changed on the staged `sites/default`.
* be determined, or cannot be changed on the staged `sites/default`.
*/
*/
public
function
syncDefaultSiteDirectoryPermissions
(
PreApplyEvent
$event
):
void
{
public
function
syncDefaultSiteDirectoryPermissions
(
PreApplyEvent
$event
):
void
{
$staged_dir
=
$this
->
getDefaultSiteDirectoryPath
(
$event
->
stage
->
getStageDirectory
());
$staged_dir
=
$this
->
getDefaultSiteDirectoryPath
(
$event
->
stage
->
getStageDirectory
());
...
@@ -104,7 +104,7 @@ class SiteConfigurationExcluder implements EventSubscriberInterface {
...
@@ -104,7 +104,7 @@ class SiteConfigurationExcluder implements EventSubscriberInterface {
// This is borrowed from \Symfony\Component\Filesystem\Filesystem::copy(),
// This is borrowed from \Symfony\Component\Filesystem\Filesystem::copy(),
// to ensure the correct permissions are preserved (chmod() requires
// to ensure the correct permissions are preserved (chmod() requires
// permissions to be sent as an octal number, but fileperms() returns a
// permissions to be sent as an octal number, but fileperms() returns a
// decimal number, because PHP is just great.
// decimal number, because PHP is just great
)
.
$permissions
=
$this
->
getPermissions
(
$staged_dir
)
|
(
$this
->
getPermissions
(
$live_dir
)
&
0111
);
$permissions
=
$this
->
getPermissions
(
$staged_dir
)
|
(
$this
->
getPermissions
(
$live_dir
)
&
0111
);
if
(
!
$this
->
fileSystem
->
chmod
(
$staged_dir
,
$permissions
))
{
if
(
!
$this
->
fileSystem
->
chmod
(
$staged_dir
,
$permissions
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment