Commit 02ec5093 authored by Adrian Rossouw's avatar Adrian Rossouw Committed by adrian

#319270 - package dependency checking between platforms. some fixes to the site manifests

parent b46237f4
......@@ -86,6 +86,10 @@ function _provision_cvs_deploy_version_from_tag($tag) {
if (!$tag || $tag == 'HEAD') {
$version = 'HEAD';
}
// See if it's a Drupal core release
elseif (preg_match('@^DRUPAL-(\d+)-(\d+)$@', $tag, $match)) {
$version = $match[1] . '.' . $match[2];
}
// See if it's a full, official release from a tag:
elseif (preg_match('@^DRUPAL-(\d+)--(\d+)-(\d+)(-.+)?@', $tag, $match)) {
$version = $match[1] .'.x-'. $match[2] .'.'. $match[3];
......
......@@ -435,6 +435,9 @@ function _provision_find_packages($scope, $key = '') {
* Map the system table to a packages multi-dimensional array component
*/
function provision_drupal_system_map() {
// Load the version specific include files.
provision_platform_include(dirname(__FILE__), 'packages');
$profile = drush_get_option('profile');
$profiles = _provision_find_profiles();
......@@ -444,6 +447,9 @@ function provision_drupal_system_map() {
$result = db_query("SELECT * FROM {system} WHERE type='module'");
while ($module = db_fetch_object($result)) {
$info_file = sprintf("%s/%s.info", dirname($module->filename), $module->name);
$module->info = provision_parse_info_file($info_file);
_provision_cvs_deploy($module);
$module->filename = realpath($module->filename);
$packages['modules'][$module->name] = $module;
......@@ -453,6 +459,8 @@ function provision_drupal_system_map() {
$result = db_query("SELECT * FROM {system} WHERE type='theme'");
while ($theme = db_fetch_object($result)) {
$info_file = sprintf("%s/%s.info", dirname($theme->filename), $theme->name);
$theme->info = provision_parse_info_file($info_file);
_provision_cvs_deploy($theme);
$theme->filename = realpath($theme->filename);
$packages['themes'][$theme->name] = $theme;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment