Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#3383 - fix label not being used for drush config:import command #3384

Merged
merged 2 commits into from
Feb 14, 2018
Merged

#3383 - fix label not being used for drush config:import command #3384

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e9ba12
#3383 - fix label not being used for drush config:import command
seanbeaton Feb 13, 2018
1128f70
#3383 - use ConfigCommand's getDirectory function to get config dir o…
seanbeaton Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/Drupal/Commands/config/ConfigImportCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,9 @@ public function __construct(ConfigManagerInterface $configManager, StorageInterf
public function import($label = null, $options = ['preview' => 'list', 'source' => self::REQ, 'partial' => false, 'diff' => false])
{
// Determine source directory.
if ($target = $options['source']) {
$source_storage = new FileStorage($target);
} else {
$source_storage = $this->getConfigStorageSync();
}

$source_storage_dir = ConfigCommands::getDirectory($label, $options['source']);
$source_storage = new FileStorage($source_storage_dir);

// Determine $source_storage in partial case.
$active_storage = $this->getConfigStorage();
Expand Down