From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 21 Aug 2011 03:26:45 +0000 (-0500)
Subject: We should use os.path.join to concatenate directories.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2db2211d96ec200471af675c55ae95c1b5f4ac0d;p=mediagoblin.git

We should use os.path.join to concatenate directories.
---

diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index 812d1486..367924a5 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -95,7 +95,6 @@ def env_import(args):
     if not args.cache_path:
         args.cache_path = tempfile.mkdtemp()
 
-    # args.cache_path += 'mediagoblin-data'
     setup_global_and_app_config(args.conf_file)
 
     # Creates mg_globals.public_store and mg_globals.queue_store
@@ -111,7 +110,8 @@ def env_import(args):
 
     tf.extractall(args.cache_path)
 
-    args.cache_path += 'mediagoblin-data'
+    args.cache_path = os.path.join(
+        args.cache_path, 'mediagoblin-data')
     args = _setup_paths(args)
 
     # Import database from extracted data