From e13729fe7b81922602adc859348797980a18648d 2007-08-26 09:15:26
From: vivainio
Date: 2007-08-26 09:15:26
Subject: [PATCH] Command line args have the highest priority again
---

diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py
index 3d10d91..afa1741 100644
--- a/IPython/ipmaker.py
+++ b/IPython/ipmaker.py
@@ -6,7 +6,7 @@ Requires Python 2.1 or better.
 
 This file contains the main make_IPython() starter function.
 
-$Id: ipmaker.py 2649 2007-08-21 18:19:20Z vivainio $"""
+$Id: ipmaker.py 2672 2007-08-26 09:15:26Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -654,6 +654,9 @@ object? -> Details about 'object'. ?object also works, ?? prints more.
         print "Error importing ipy_user_conf - perhaps you should run %upgrade?"
         IP.InteractiveTB()
         import_fail_info("ipy_user_conf")
+
+    # finally, push the argv to options again to ensure highest priority
+    IP_rc.update(opts)
     
     # release stdout and stderr and save config log into a global summary
     msg.config.release_all()
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9fed3da..26aaf93 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-26  Ville Vainio  <vivainio@gmail.com>
+
+	* ipmaker.py: Command line args have the highest priority again
+    
 2007-08-22  Ville Vainio  <vivainio@gmail.com>
 
 	* iplib.py: no extra empty (last) line in raw hist w/ multiline