opendev/system-config
Code Issues Proposed changes

Change diff command used by manage_projects.py.

Browse Source 
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 <corvus@inaugust.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-11-15 14:25:13 -08:00 committed by Jenkins
parent 7390450969
commit e6d25c33c9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gerrit/files/scripts/manage_projects.py
View File

@ -113,7 +113,7 @@ def copy_acl_config(project, repo_path, acl_config):
status, _ = run_command("cp %s %s" % status, _ = run_command("cp %s %s" %
(acl_config, acl_dest), status=True) (acl_config, acl_dest), status=True)
if status == 0: if status == 0:
status = git_command(repo_path, "diff-index --quiet HEAD --") status = git_command(repo_path, "diff --quiet HEAD")
if status != 0: if status != 0:
return True return True
return False return False