From e6d25c33c91b5c858f1a5285db8bdc4b09fd5843 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 15 Nov 2012 14:25:13 -0800 Subject: [PATCH] Change diff command used by manage_projects.py. manage_projects.py was running `git diff-index --quiet HEAD --` previously to check if project.config had changed. This apparently returns an exit code of 1 in some cases where a diff was not expected. Switch to using `git diff --quiet HEAD` to check if any differences are found. This appears to be more reliable in some manual testing. Change-Id: I253423e41f80d71a5f2389bfc421e799f00f6fd9 Reviewed-on: https://review.openstack.org/16236 Reviewed-by: James E. Blair Reviewed-by: Paul Belanger Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- modules/gerrit/files/scripts/manage_projects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gerrit/files/scripts/manage_projects.py b/modules/gerrit/files/scripts/manage_projects.py index 0bb0fc749a..9f5c518085 100755 --- a/modules/gerrit/files/scripts/manage_projects.py +++ b/modules/gerrit/files/scripts/manage_projects.py @@ -113,7 +113,7 @@ def copy_acl_config(project, repo_path, acl_config): status, _ = run_command("cp %s %s" % (acl_config, acl_dest), status=True) if status == 0: - status = git_command(repo_path, "diff-index --quiet HEAD --") + status = git_command(repo_path, "diff --quiet HEAD") if status != 0: return True return False