Francesco Romani has uploaded a new change for review.

Change subject: build: fix dbscripts-duplicate_upgrade_scripts.sh
......................................................................

build: fix dbscripts-duplicate_upgrade_scripts.sh

'uniq' expected sorted input. This patch fixes the check
by prepending 'sort' in the pipeline right after 'uniq'
invocation.

Change-Id: I509b34c402becb15ab55970e9c1e3ee5e2c5d69f
Signed-off-by: Francesco Romani <[email protected]>
---
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/85/39685/1

diff --git a/build/dbscripts-duplicate_upgrade_scripts.sh 
b/build/dbscripts-duplicate_upgrade_scripts.sh
index f9f2b12..39420eb 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 | uniq -d)"
+OUT="$(find "$(dirname "$0")/../packaging/dbscripts" | 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/39685
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I509b34c402becb15ab55970e9c1e3ee5e2c5d69f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to