diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-13 11:03:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-03 23:38:07 +0100 |
| commit | cf13f53bf32ccde8e162da8e9bb85dd5159f4531 (patch) | |
| tree | 759744bde45993ee82684555bbd0ba7797461ff6 /offapi | |
| parent | d385c6379ae7805abec28e30dec6c10fcb1a6006 (diff) | |
Make registry's mergeKey fail if it cannot process regFileName
...so that regmerge fails for bad regfile arguments. Add -v to the regmerge
calls in update-rdb.sh so that an error message is printed in case of failure.
Change-Id: I6613b9756b4e5628772541580938f6c80fd9bc9e
(cherry picked from commit 53fbd30b3cd6465251b1b07f4728813d524fcd82)
Diffstat (limited to 'offapi')
| -rwxr-xr-x | offapi/type_reference/update-rdb.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/offapi/type_reference/update-rdb.sh b/offapi/type_reference/update-rdb.sh index 0f41721b6c5f..79fd29cac01d 100755 --- a/offapi/type_reference/update-rdb.sh +++ b/offapi/type_reference/update-rdb.sh @@ -24,10 +24,10 @@ fi mkdir tmp for i in "$@"; do - "${OUTDIR_FOR_BUILD?}"/bin/regmerge tmp/out1.rdb /UCR \ + "${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out1.rdb /UCR \ "${WORKDIR_FOR_BUILD?}"/UnoApiPartTarget/"${i%.idl}".urd done -"${OUTDIR_FOR_BUILD?}"/bin/regmerge tmp/out2.rdb / \ +"${OUTDIR_FOR_BUILD?}"/bin/regmerge -v tmp/out2.rdb / \ "${SRC_ROOT?}"/offapi/type_reference/types.rdb tmp/out1.rdb echo "sanity check diff:" diff <("${OUTDIR_FOR_BUILD?}"/bin/regview \ |