Index: includes/file.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/file.inc,v retrieving revision 1.74.2.2 diff -u -F^f -r1.74.2.2 file.inc --- includes/file.inc 1 Jun 2006 21:36:59 -0000 1.74.2.2 +++ includes/file.inc 6 Jun 2006 20:01:19 -0000 @@ -653,6 +653,10 @@ function file_scan_directory($dir, $mask $callback($filename); } } + else { + watchdog('file_debug', t("file %file doesn't match mask %mask", + array('%file' => theme('placeholder', $file), '%mask' => theme('placeholder', $mask)))); + } } } Index: modules/project/release.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/release.inc,v retrieving revision 1.70.2.2 diff -u -F^f -r1.70.2.2 release.inc --- modules/project/release.inc 1 Jun 2006 09:56:51 -0000 1.70.2.2 +++ modules/project/release.inc 6 Jun 2006 20:01:20 -0000 @@ -58,8 +58,14 @@ function project_release_scan_parse($pat $file = basename($path); //preg_match('/^(.+?)-([0-9.]+(?:-.*)|[^-]+)\.(tar\.gz|zip)$/', $file, $matches); preg_match('/^(.+?)-([0-9.]+(?:-.*)|[^-]+)\.(tar.gz$|zip$)/', $file, $matches); + if (!isset($matches)) { + project_release_scan_directory_results(t('error')); + watchdog('project_debug', t("release_scan_parse: file %file doesn't match", array('%file' => theme('placeholder', $file)))); + } list($filename, $name, $version) = $matches; - + if ($name == "version") { + watchdog('project_debug', t("found 'version' tarball: file: %file, name: %name, version: %version", array('%file' => theme('placeholder', $file), '%name' => theme('placeholder', $name), '%version' => theme('placeholder', $version)))); + } // If the project was not previously loaded, load its data, including previous releases. if (!$projects[$name]) { if ($project = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid, n.type, n.moderate FROM {node} n INNER JOIN {project_projects} p ON n.nid = p.nid WHERE p.uri = '%s'"), $name))) { @@ -75,6 +81,8 @@ function project_release_scan_parse($pat } else { // No project found for this id. + project_release_scan_directory_results(t('error')); + watchdog('project_debug', t("No project node found with uri: %name", array('%name' => theme('placeholder', $name)))); return; } $projects[$name] = & $project; @@ -339,6 +347,8 @@ function project_release_save($release) // This test should not be needed, but duplicate releases on drupal.org suggest // that an unidentified problem is causing duplicate versions to be saved. if (db_num_rows(db_fetch_object(db_query("SELECT rid FROM {project_releases} WHERE nid = %d AND version = '%s'", $release->nid, $release->version)))) { + project_release_scan_directory_results(t('error')); + watchdog('project_debug', t("Duplicate version (%version) detected for node: %nid, not saving %file", array('%version' => theme('placeholder', $version), '%nid' => $nid, '%file' => theme('placeholder', $release->path)))); return FALSE; } $release->rid = db_next_id('project_rid');