[Jython-checkins] SF.net SVN: jython:[6277] trunk/jython/src/org/python/core/PySystemState. java

[<otm...@us...>]

Revision: 6277
          http://jython.svn.sourceforge.net/jython/?rev=6277&view=rev
Author:   otmarhumbel
Date:     2009-04-29 05:48:23 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
revert to user registry having precedence over installed registry;
should fix #1331

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PySystemState.java

Modified: trunk/jython/src/org/python/core/PySystemState.java
===================================================================
--- trunk/jython/src/org/python/core/PySystemState.java	2009-04-29 04:39:13 UTC (rev 6276)
+++ trunk/jython/src/org/python/core/PySystemState.java	2009-04-29 05:48:23 UTC (rev 6277)
@@ -585,9 +585,10 @@
                 prefix = exec_prefix = ".";
             }
             try {
-                addRegistryFile(new File(prefix, "registry"));
+                // user registry has precedence over installed registry
                 File homeFile = new File(registry.getProperty("user.home"), ".jython");
                 addRegistryFile(homeFile);
+                addRegistryFile(new File(prefix, "registry"));
             } catch (Exception exc) {
             }
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.