Index: drush_make.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.drush.inc,v retrieving revision 1.11.2.32 diff -u -F '^f' -r1.11.2.32 drush_make.drush.inc --- drush_make.drush.inc 27 Nov 2009 18:53:36 -0000 1.11.2.32 +++ drush_make.drush.inc 29 Nov 2009 19:44:42 -0000 @@ -10,6 +10,16 @@ include_once 'drush_make.queue.inc'; /** + * Implement EXTENSION_drush_init(). + */ +function drush_make_drush_init() { + // The default URL to use for retrieving update XML files. + drush_set_default('drush-make-update-default-url', DRUSH_MAKE_UPDATE_DEFAULT_URL); + // The default method drush_make will use to find the best release. + drush_set_default('drush-make-version-best', DRUSH_MAKE_VERSION_BEST); +} + +/** * Implementation of hook_drush_command(). */ function drush_make_drush_command() { @@ -86,8 +96,8 @@ function drush_make_add_projects($recurs 'base_path' => $base_path, 'install_path' => $install_path, 'tmp_path' => $tmp_path, - 'version' => DRUSH_MAKE_VERSION_BEST, - 'location' => DRUSH_MAKE_UPDATE_DEFAULT_URL, + 'version' => drush_get_option('drush-make-version-best'), + 'location' => drush_get_option('drush-make-update-default-url'), 'subdir' => '', 'directory_name' => '', 'queue' => $queue, @@ -146,8 +156,8 @@ function drush_make_add_libraries($insta 'base_path' => $base_path, 'install_path' => $install_path, 'tmp_path' => $tmp_path, - 'version' => DRUSH_MAKE_VERSION_BEST, - 'location' => DRUSH_MAKE_UPDATE_DEFAULT_URL, + 'version' => drush_get_option('drush-make-version-best'), + 'location' => drush_get_option('drush-make-update-default-url'), 'subdir' => '', 'directory_name' => $key, 'queue' => $queue, @@ -224,7 +234,7 @@ function drush_make_update_xml_download( } // Find the best release. - if ($project['version'] == DRUSH_MAKE_VERSION_BEST) { + if ($project['version'] == drush_get_option('drush-make-version-best')) { $recommended_major = (string)$project['release_history']->recommended_major; $project['version'] = _drush_make_update_xml_best_version($recommended_major, $releases); } Index: drush_make.generate.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.generate.inc,v retrieving revision 1.1.2.3 diff -u -F '^f' -r1.1.2.3 drush_make.generate.inc --- drush_make.generate.inc 27 Nov 2009 02:12:39 -0000 1.1.2.3 +++ drush_make.generate.inc 29 Nov 2009 19:44:42 -0000 @@ -77,7 +77,7 @@ function _drush_generate_makefile_update // First we set up the project information array. $project = array( 'name' => $name, - 'location' => (isset($info['location']) ? $info['location'] : DRUSH_MAKE_UPDATE_DEFAULT_URL), + 'location' => (isset($info['location']) ? $info['location'] : drush_get_option('drush-make-update-default-url')), 'core' => DRUPAL_CORE_COMPATIBILITY, ); Index: contrib/drush_make_d_o.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/contrib/Attic/drush_make_d_o.drush.inc,v retrieving revision 1.1.2.5 diff -u -F '^f' -r1.1.2.5 drush_make_d_o.drush.inc --- contrib/drush_make_d_o.drush.inc 29 Nov 2009 06:30:28 -0000 1.1.2.5 +++ contrib/drush_make_d_o.drush.inc 29 Nov 2009 19:44:42 -0000 @@ -202,7 +202,7 @@ function drush_make_d_o_check_valid_vers * items are collected for the package. */ function drush_make_d_o_updatexml($project) { - $xml = file_get_contents(DRUSH_MAKE_UPDATE_DEFAULT_URL . '/' . $project['name'] . '/' . $project['core']); + $xml = file_get_contents(drush_get_option('drush-make-update-default-url') . '/' . $project['name'] . '/' . $project['core']); // First, get the release history. $release_history = simplexml_load_string($xml); if (!is_object($release_history) || !$release_history->title) {