From 69ce65f3ed80c303e8232cdc661ba6af939d65e2 2006-05-31 14:24:23
From: vivainio
Date: 2006-05-31 14:24:23
Subject: [PATCH] call upgrade_dir with args in parens to work correctly with 
dirs that have spaces.

---

diff --git a/IPython/Magic.py b/IPython/Magic.py
index 2af8129..568a9dc 100644
--- a/IPython/Magic.py
+++ b/IPython/Magic.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Magic functions for InteractiveShell.
 
-$Id: Magic.py 1335 2006-05-30 06:02:44Z fperez $"""
+$Id: Magic.py 1338 2006-05-31 14:24:23Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -2952,10 +2952,10 @@ Defaulting color scheme to 'NoColor'"""
         """
         ip = self.getapi()
         ipinstallation = path(IPython.__file__).dirname()
-        upgrade_script = sys.executable + " " + ipinstallation / 'upgrade_dir.py'
+        upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py')
         src_config = ipinstallation / 'UserConfig'
         userdir = path(ip.options.ipythondir)
-        cmd = upgrade_script + " " + src_config + " " + userdir
+        cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir)
         print ">",cmd
         shell(cmd)
         if arg == '-nolegacy':
diff --git a/IPython/upgrade_dir.py b/IPython/upgrade_dir.py
index 6bc1f8b..d7714b4 100644
--- a/IPython/upgrade_dir.py
+++ b/IPython/upgrade_dir.py
@@ -76,7 +76,7 @@ def upgrade_dir(srcdir, tgtdir):
         #print rpt
     pickle.dump(rpt, rep.open('w'))
     if modded:
-        print "\n\nDelete the following files manually if you need a full upgrade:"
+        print "\n\nDelete the following files manually (and rerun %upgrade)\nif you need a full upgrade:"
         for m in modded:
             print m
             
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 246c473..ae13ddf 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-31  Ville Vainio  <vivainio@gmail.com>
+
+	* upgrade_dir.py, Magic.py (magic_upgrade): call upgrade_dir
+	with args in parens to work correctly with dirs that have spaces.
+
 2006-05-30  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* IPython/Logger.py (Logger.logstart): add option to log raw input