Changeset 38986 for trunk/Ohana/src/relastro/src/relastro_merge_source.c
- Timestamp:
- Oct 27, 2015, 4:49:06 PM (11 years ago)
- Location:
- trunk/Ohana
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/relastro/src/relastro_merge_source.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Ohana
-
Property svn:mergeinfo
set to
/branches/eam_branches/ipp-20150625/Ohana merged eligible
-
Property svn:mergeinfo
set to
-
trunk/Ohana/src/relastro/src/relastro_merge_source.c
r38441 r38986 122 122 resort_catalog (&catalog_src); 123 123 124 dvo_catalog_save (&catalog_src, VERBOSE2); 125 dvo_catalog_unlock (&catalog_src); 124 SetProtect (TRUE); 125 if (!dvo_catalog_save (&catalog_src, VERBOSE2)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog_src.filename); exit (1); } 126 if (!dvo_catalog_unlock (&catalog_src)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog_src.filename); exit (1); } 127 SetProtect (FALSE); 126 128 dvo_catalog_free (&catalog_src); 127 129
Note:
See TracChangeset
for help on using the changeset viewer.
