Merge lp://qastaging/~jderose/dmedia/import-update into lp://qastaging/dmedia
Proposed by
Jason Gerard DeRose
| Status: | Merged |
|---|---|
| Merged at revision: | 944 |
| Proposed branch: | lp://qastaging/~jderose/dmedia/import-update |
| Merge into: | lp://qastaging/dmedia |
| Diff against target: |
124 lines (+81/-5) 3 files modified
dmedia/importer.py (+2/-5) dmedia/metastore.py (+10/-0) dmedia/tests/test_metastore.py (+69/-0) |
| To merge this branch: | bzr merge lp://qastaging/~jderose/dmedia/import-update |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Jordan | Approve | ||
|
Review via email:
|
|||
Commit message
This switches the importer to use Database.update() instead of Database.save(), which fixes an import failure that can occur when importing duplicate files (files already in Dmedia).
For details, see:
https:/
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good. Thanks for finding this issue and documenting to problem and solution. Approved!