Re: [ovirt-devel] dbscripts-duplicate_upgrade_scripts.sh and 03_06_1240_revert_03_06_1210_add_vm_host_device_commands.sql problem
Hi,
here is the fix:
https://gerrit.ovirt.org/39942
Martin
----- Original Message -----
From: "Francesco Romani" <fromani(a)redhat.com>
To: "Yedidyah Bar David" <didi(a)redhat.com>
Cc: devel(a)ovirt.org
Sent: Thursday, April 16, 2015 12:37:21 PM
Subject: Re: [ovirt-devel] dbscripts-duplicate_upgrade_scripts.sh and
03_06_1240_revert_03_06_1210_add_vm_host_device_commands.sql problem
Hi,
----- Original Message -----
> From: "Yedidyah Bar David" <didi(a)redhat.com>
> To: "Jakub Niedermertl" <jniederm(a)redhat.com>
> Cc: devel(a)ovirt.org
> Sent: Thursday, April 16, 2015 12:28:49 PM
> Subject: Re: [ovirt-devel] dbscripts-duplicate_upgrade_scripts.sh and
> 03_06_1240_revert_03_06_1210_add_vm_host_device_commands.sql problem
>
> ----- Original Message -----
> > From: "Jakub Niedermertl" <jniederm(a)redhat.com>
> > To: devel(a)ovirt.org
> > Sent: Thursday, April 16, 2015 1:16:18 PM
> > Subject: [ovirt-devel] dbscripts-duplicate_upgrade_scripts.sh and
> > 03_06_1240_revert_03_06_1210_add_vm_host_device_commands.sql problem
> >
> > Hi all,
> >
> > I can't compile engine master, following message is printed
> >
> > Found duplicate upgrade scripts with version 03_06_1210, please
> > resolve
> > and retry
> > make[1]: *** [validations] Error 1
> > make[1]: Leaving directory `/home/jakub/src/ovirt-engine'
> > make: *** [all-dev] Error 2
> >
> > It seems that command in dbscripts-duplicate_upgrade_scripts.sh
> >
> > OUT="$(find "$(dirname
"$0")/../packaging/dbscripts" | grep -P
> > '\d{2}_\d{2}_\d{2,8}' -o | sort | uniq -d)"
> >
> > is too dummy to handle '..._revert_03_06_1210_...' upgrade script
name.
I believe is grep being too smart. It matches the pattern twice in
03_06_1240_revert_03_06_1210_add_vm_host_device_commands.sql
and this introduce a false duplicate.
Quick fix, maybe too hackish to be the definitive one:
grep -P '/\d{2}_\d{2}_\d{2,8}' -o
(note the leading slash in the pattern being searched)
Bests,
--
Francesco Romani
RedHat Engineering Virtualization R & D
Phone: 8261328
IRC: fromani
_______________________________________________
Devel mailing list
Devel(a)ovirt.org
http://lists.ovirt.org/mailman/listinfo/devel