Skip to content

Commit

Permalink
Merge pull request #984 from Decipher/983-make_format
Browse files Browse the repository at this point in the history
983: Fix for makefiles using querystrings
  • Loading branch information
jhedstrom committed Dec 1, 2014
2 parents a13917c + e3b00b2 commit bd7fd30
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions commands/make/make.utilities.inc
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ function make_parse_info_file($makefile, $parsed = TRUE, $makefile_options = arr
elseif (ParserYaml::supportedFile($makefile)) {
$info = ParserYaml::parse($data);
}
elseif ($makefile === '-') {
$info = _make_determine_format($data);
}
else {
return drush_set_error('MAKE_INVALID_FORMAT', dt('Invalid file format: !makefile', array('!makefile' => $makefile)));
$info = _make_determine_format($data);
}

// $makefile_options are from projects[projectname][options][...] = value in
Expand Down

0 comments on commit bd7fd30

Please sign in to comment.