From eb947f7a64cb12d86cd0aaeb8184c0a64fd7019a Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Mon, 23 Sep 2013 16:07:16 +0200 Subject: [PATCH] Groups-dev distbuild checked wrong Git repository commit hash The distbuild process checked .git/packed-refs instead of .git/refs/heads/master. This file is required for triggering automatic staging site rebuild. Change-Id: I177dda27140ac6af7f3c94c9b161b5b24c4ba0c0 --- modules/drupal/manifests/distbuild.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/drupal/manifests/distbuild.pp b/modules/drupal/manifests/distbuild.pp index 3178d3b673..66ee441a2b 100644 --- a/modules/drupal/manifests/distbuild.pp +++ b/modules/drupal/manifests/distbuild.pp @@ -53,15 +53,15 @@ define drupal::distbuild ( timeout => 900, cwd => "${site_sandbox_root}/${$site_build_repo_name}", command => "rm -rf ${site_staging_root}/${site_staging_tarball} && drush make --tar ${site_makefile} ${site_staging_root}/${site_staging_tarball}", - unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/packed-refs ${site_build_flagfile}", + unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/refs/heads/master ${site_build_flagfile}", require => File[$site_staging_root], subscribe => Vcsrepo["${site_sandbox_root}/${$site_build_repo_name}"], } exec { 'drupal-build-dist-post': path => '/usr/bin:/bin', - command => "cp ${site_sandbox_root}/${$site_build_repo_name}/.git/packed-refs ${site_build_flagfile} && rm -rf ${site_deploy_flagfile}", - unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/packed-refs ${site_build_flagfile}", + command => "cp ${site_sandbox_root}/${$site_build_repo_name}/.git/refs/heads/master ${site_build_flagfile} && rm -rf ${site_deploy_flagfile}", + unless => "diff ${site_sandbox_root}/${$site_build_repo_name}/.git/refs/heads/master ${site_build_flagfile}", subscribe => Vcsrepo["${site_sandbox_root}/${$site_build_repo_name}"], require => Exec['drupal-build-dist'], }