Skip to content

Commit

Permalink
#3383 - fix label not being used for drush config:import command (#3384)
Browse files Browse the repository at this point in the history
* #3383 - fix label not being used for drush config:import command

* #3383 - use ConfigCommand's getDirectory function to get config dir on import
  • Loading branch information
seanbeaton authored and weitzman committed Feb 14, 2018
1 parent d42bd49 commit 763b46f
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/Drupal/Commands/config/ConfigImportCommands.php
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

0 comments on commit 763b46f

Please sign in to comment.