diff options
| author | Adrian Rossouw | 2009-07-01 22:58:18 (GMT) |
|---|---|---|
| committer | adrian | 2009-07-01 22:58:18 (GMT) |
| commit | 73120e53daed17e7af234b7c8e4ff0e4a18b7c12 (patch) | |
| tree | 0a4480992bde470259f0ca57e456886cfa6a8c13 | |
| parent | 3ebd37aa0306a85485505a860c493e882c2ff2b9 (diff) | |
Fixed an error with provision verify i introduced alongside the chmod_recursive path function6.x-0.3-rc1
| -rw-r--r-- | platform/provision_drupal.drush.inc | 2 | ||||
| -rw-r--r-- | provision.path.inc | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/platform/provision_drupal.drush.inc b/platform/provision_drupal.drush.inc index 4a598b6..dbbfb99 100644 --- a/platform/provision_drupal.drush.inc +++ b/platform/provision_drupal.drush.inc @@ -342,7 +342,7 @@ function _provision_drupal_get_cvs_versions($files) { $project['project'] = cvs_deploy_get_project_name($project); } _cvs_deploy_version_alter($file->info['version'], $project); - $name = ($project['project']) ? $project['project'] : $modulename; + $name = !empty($project['project']) ? $project['project'] : $modulename; $files[$name] = $file; } diff --git a/provision.path.inc b/provision.path.inc index e6bbafe..068b245 100644 --- a/provision.path.inc +++ b/provision.path.inc @@ -79,9 +79,6 @@ function provision_path($op, $path, $confirm = TRUE, $succeed_message = NULL, $f $value = $func($path, $confirm, $reason); - if ($op == 'chmod') { - $confirm = sprintf('%o', $confirm); # convert octal to string representation - } clearstatcache(); // this needs to be called, otherwise we get the old info $tokens = array("@path" => $path, "@op" => $op, "@confirm" => $confirm); if ($reason) { @@ -170,7 +167,7 @@ function provision_path_chmod($path, &$perms, &$reason, $recursive = FALSE) { } clearstatcache(); // this needs to be called, otherwise we get the old info $value = substr(sprintf('%o', fileperms($path)), -4); - $perms = sprintf('%o', $perms); + $perms = sprintf('%04o', $perms); return $value; } |