? dif cvs diff: Diffing . Index: cvs_deploy.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cvs_deploy/cvs_deploy.module,v retrieving revision 1.9.2.7 diff -u -p -u -p -r1.9.2.7 cvs_deploy.module --- cvs_deploy.module 23 Jan 2008 21:00:28 -0000 1.9.2.7 +++ cvs_deploy.module 27 Feb 2008 21:14:15 -0000 @@ -42,7 +42,7 @@ function cvs_deploy_version_from_tag($ta */ function cvs_deploy_system_info_alter(&$info, $project) { // First, alter the version string based on the CVS sticky tag. - _cvs_deploy_version_alter($info['version'], $project); + _cvs_deploy_version_alter($info['version'], $project, TRUE); // Now, if we don't know the 'project' attribute, fill it in based on the // CVS/Repository file. @@ -71,7 +71,7 @@ function cvs_deploy_system_info_alter(&$ * Private helper to alter the version of a module based on what we can figure * out about the CVS tag in use. */ -function _cvs_deploy_version_alter(&$version, $project) { +function _cvs_deploy_version_alter(&$version, $project, $alter_core_dev) { static $available = array(); $match = array(); if (empty($version)) { @@ -115,6 +115,12 @@ function _cvs_deploy_version_alter(&$ver } } } + if ($alter_core_dev && preg_match('/\d\.\d-dev/', $version)) { + // Special case for the core -dev version strings in the VERSION constant. + // In this case, we want to remap to just "5.x-dev" so that things match + // what we find for the available downloads. + $version = '5.x-dev'; + } } /** @@ -199,7 +205,7 @@ function cvs_deploy_form_alter($form_id, if (empty($project['project'])) { $project['project'] = cvs_deploy_get_project_name($project); } - _cvs_deploy_version_alter($file->info['version'], $project); + _cvs_deploy_version_alter($file->info['version'], $project, FALSE); $form['version'][$modulename]['#value'] = $file->info['version']; } }