diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-03-06 00:36:15 +0100 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-03-06 00:36:15 +0100 |
| commit | 3d541b04a9c5fe5729ce1b4386a2964b2730484d (patch) | |
| tree | 8bbb87bef4e4ff3df35f2bc492f038328fed459e /mediagoblin/db/util.py | |
| parent | b01a3b938666569cc021698ce854fb534e4d85e3 (diff) | |
| parent | b62b3b982a2543fb881c93570c544fbef61dd97e (diff) | |
| download | mediagoblin-3d541b04a9c5fe5729ce1b4386a2964b2730484d.tar.lz mediagoblin-3d541b04a9c5fe5729ce1b4386a2964b2730484d.tar.xz mediagoblin-3d541b04a9c5fe5729ce1b4386a2964b2730484d.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/db/util.py')
| -rw-r--r-- | mediagoblin/db/util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index 73aee238..ff7aaf79 100644 --- a/mediagoblin/db/util.py +++ b/mediagoblin/db/util.py @@ -21,7 +21,7 @@ except ImportError: if use_sql: from mediagoblin.db.sql.fake import ObjectId, InvalidId, DESCENDING - from mediagoblin.db.sql.util import atomic_update + from mediagoblin.db.sql.util import atomic_update, check_media_slug_used else: from mediagoblin.db.mongo.util import \ - ObjectId, InvalidId, DESCENDING, atomic_update + ObjectId, InvalidId, DESCENDING, atomic_update, check_media_slug_used |