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/gmg_commands/mongosql.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/gmg_commands/mongosql.py')
| -rw-r--r-- | mediagoblin/gmg_commands/mongosql.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/gmg_commands/mongosql.py b/mediagoblin/gmg_commands/mongosql.py index a25263e2..dd53f575 100644 --- a/mediagoblin/gmg_commands/mongosql.py +++ b/mediagoblin/gmg_commands/mongosql.py @@ -14,12 +14,15 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from mediagoblin.db.sql.convert import run_conversion - def mongosql_parser_setup(subparser): pass def mongosql(args): + # First, make sure our mongo migrations are up to date... + from mediagoblin.gmg_commands.migrate import run_migrate + run_migrate(args.conf_file) + + from mediagoblin.db.sql.convert import run_conversion run_conversion(args.conf_file) |