Jakub Niedermertl has uploaded a new change for review. Change subject: core: Fix db upgrage scripts numbering check ......................................................................
core: Fix db upgrage scripts numbering check Fixes issue in db upgrade scripts numbering check to prevent duplicate scripts with same number. Previous version of the script allows duplicates. Change-Id: I4e48052b4e65e9e1cccd8be82acf0b4bcd59f7c4 Signed-off-by: Jakub Niedermertl <jnied...@redhat.com> --- M build/dbscripts-duplicate_upgrade_scripts.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/39947/1 diff --git a/build/dbscripts-duplicate_upgrade_scripts.sh b/build/dbscripts-duplicate_upgrade_scripts.sh index fac47e6..4fffcb7 100755 --- a/build/dbscripts-duplicate_upgrade_scripts.sh +++ b/build/dbscripts-duplicate_upgrade_scripts.sh @@ -1,6 +1,6 @@ #!/bin/sh -OUT="$(find "$(dirname "$0")/../packaging/dbscripts" | grep -P '^\d{2}_\d{2}_\d{2,8}' -o | sort | uniq -d)" +OUT="$(find "$(dirname "$0")/../packaging/dbscripts" -exec basename {} \; | grep -P '^\d{2}_\d{2}_\d{2,8}' -o | sort | uniq -d)" if [ -n "${OUT}" ]; then echo "Found duplicate upgrade scripts with version $(echo ${OUT}), please resolve and retry" >&2 -- To view, visit https://gerrit.ovirt.org/39947 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e48052b4e65e9e1cccd8be82acf0b4bcd59f7c4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jakub Niedermertl <jnied...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches