diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-03-18 12:12:41 -0500 |
| commit | 94e605237512daa518bcab9b59edbc1107840006 (patch) | |
| tree | eb1aa0b714c536f68474f0853c251ed4c5d683cf /mediagoblin/db/util.py | |
| parent | bf0f67ad6547e2073770942ddf66f23d3181831a (diff) | |
| parent | 54477b4d76ca983e2e884fea9c0975c7e63fdc1d (diff) | |
| download | mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.lz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.tar.xz mediagoblin-94e605237512daa518bcab9b59edbc1107840006.zip | |
Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments
Conflicts:
mediagoblin/db/mongo/migrations.py
Diffstat (limited to 'mediagoblin/db/util.py')
| -rw-r--r-- | mediagoblin/db/util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index ff7aaf79..540a9244 100644 --- a/mediagoblin/db/util.py +++ b/mediagoblin/db/util.py @@ -21,7 +21,9 @@ except ImportError: if use_sql: from mediagoblin.db.sql.fake import ObjectId, InvalidId, DESCENDING - from mediagoblin.db.sql.util import atomic_update, check_media_slug_used + from mediagoblin.db.sql.util import atomic_update, check_media_slug_used, \ + media_entries_for_tag_slug else: from mediagoblin.db.mongo.util import \ - ObjectId, InvalidId, DESCENDING, atomic_update, check_media_slug_used + ObjectId, InvalidId, DESCENDING, atomic_update, \ + check_media_slug_used, media_entries_for_tag_slug |