diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2010-12-19 22:43:51 +0100 |
---|---|---|
committer | Patrick Ohly <patrick.ohly@intel.com> | 2010-12-19 22:46:53 +0100 |
commit | d68c46d02710c19e4db2c854966aec972542a2a9 (patch) | |
tree | 4719fe8fceaaa9eac661a8abf3390c159be775a6 /src/sysync/localengineds.cpp | |
parent | 3d76d2399ba9312290375e8f97755b8db87628bf (diff) |
temporary ID mapping: flag unexpected state as real errors
As explained by Lukas in the "[os-libsynthesis] temporary UID mapping"
mail thread, the code which catches ID conflicts just works around
symptoms. The code should never be triggered.
This patch thus turns the messages into errors. Lukas' patch will fix
the real issue. Keeping the code is still useful to have a fallback,
just in case. At least for a while: the duplicate check is costly and
should be removed once the fix has been verified sufficiently.
Diffstat (limited to 'src/sysync/localengineds.cpp')
-rw-r--r-- | src/sysync/localengineds.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sysync/localengineds.cpp b/src/sysync/localengineds.cpp index c25ede8..3eec6b7 100644 --- a/src/sysync/localengineds.cpp +++ b/src/sysync/localengineds.cpp @@ -1623,8 +1623,8 @@ void TLocalEngineDS::adjustLocalIDforSize(string &aLocalID, sInt32 maxguidsize, ++it) { if (it->second == aLocalID) { // found an existing mapping! - PDEBUGPRINTFX(DBG_DATA,( - "fTempGUIDMap: translated realLocalID='%s' to tempLocalID='%s' (reused)", + PDEBUGPRINTFX(DBG_ERROR,( + "fTempGUIDMap: translated realLocalID='%s' to tempLocalID='%s' (reused?!)", aLocalID.c_str(), it->first.c_str() )); @@ -1639,7 +1639,7 @@ void TLocalEngineDS::adjustLocalIDforSize(string &aLocalID, sInt32 maxguidsize, counter++; StringObjPrintf(tempguid,"#%ld",counter); if (fTempGUIDMap.find(tempguid) != fTempGUIDMap.end()) { - PDEBUGPRINTFX(DBG_DATA,( + PDEBUGPRINTFX(DBG_ERROR,( "fTempGUIDMap: '%s' not new?!", tempguid.c_str() )); |