Skip to content

Commit

Permalink
MAGETWO-63295: Installation fails because 'generated' directory is ab…
Browse files Browse the repository at this point in the history
…sent
  • Loading branch information
shiftedreality committed Jan 18, 2017
1 parent 91aa307 commit 020811f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ atlassian*
!/var/.htaccess
/vendor/*
!/vendor/.htaccess
/generated/*
!/generated/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList

const TEMPLATE_MINIFICATION_DIR = 'html';

/**
* Generated code.
*/
const GENERATED = 'generated';

/**
* {@inheritdoc}
*/
Expand All @@ -135,6 +140,7 @@ public static function getDefaultConfig()
self::TEMPLATE_MINIFICATION_DIR => [parent::PATH => 'var/view_preprocessed/html'],
self::SETUP => [parent::PATH => 'setup/src'],
self::COMPOSER_HOME => [parent::PATH => 'var/composer_home'],
self::GENERATED => [parent::PATH => 'generated'],
];
return parent::getDefaultConfig() + $result;
}
Expand Down
1 change: 1 addition & 0 deletions lib/internal/Magento/Framework/Setup/FilePermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public function getInstallationWritableDirectories()
DirectoryList::VAR_DIR,
DirectoryList::MEDIA,
DirectoryList::STATIC_VIEW,
DirectoryList::GENERATED,
];
foreach ($data as $code) {
$this->installationWritableDirectories[$code] = $this->directoryList->getPath($code);
Expand Down

0 comments on commit 020811f

Please sign in to comment.