diff options
| author | xray7224 <xray7224@googlemail.com> | 2013-07-14 15:27:52 +0100 |
|---|---|---|
| committer | xray7224 <xray7224@googlemail.com> | 2013-07-14 15:27:52 +0100 |
| commit | e49263564b0ee8859c43e2716fcedab6e80bf164 (patch) | |
| tree | 37411b19738484cbba814e584b8d3547d3a2ded0 /mediagoblin/gmg_commands/import_export.py | |
| parent | 49a47ec991152a5dd25a7460e1d3d11afb73d32d (diff) | |
| parent | 2d0028e93283fea397133294a5eb45b67d5ed0ab (diff) | |
| download | mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.lz mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.xz mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/gmg_commands/import_export.py')
| -rw-r--r-- | mediagoblin/gmg_commands/import_export.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py index d51a1e3e..98ec617d 100644 --- a/mediagoblin/gmg_commands/import_export.py +++ b/mediagoblin/gmg_commands/import_export.py @@ -63,7 +63,7 @@ def _import_media(db, args): # TODO: Add import of queue files queue_cache = BasicFileStorage(args._cache_path['queue']) - for entry in db.MediaEntry.find(): + for entry in db.MediaEntry.query.filter_by(): for name, path in entry.media_files.items(): _log.info('Importing: {0} - {1}'.format( entry.title.encode('ascii', 'replace'), @@ -204,7 +204,7 @@ def _export_media(db, args): # TODO: Add export of queue files queue_cache = BasicFileStorage(args._cache_path['queue']) - for entry in db.MediaEntry.find(): + for entry in db.MediaEntry.query.filter_by(): for name, path in entry.media_files.items(): _log.info(u'Exporting {0} - {1}'.format( entry.title, |