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 /registry | |
| 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 'registry')
| -rw-r--r-- | registry/source/registry.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 5851199057a3..345631ad1773 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -361,7 +361,7 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg, return _ret; _ret = pReg->loadKey(pNewKey, regFileName, bWarnings, bReport); - if (_ret == REG_MERGE_ERROR || (_ret == REG_MERGE_CONFLICT && bWarnings)) + if (_ret != REG_NO_ERROR && (_ret != REG_MERGE_CONFLICT || bWarnings)) { if (pNewKey != pKey) (void) pKey->closeKey(pNewKey); |