make sure USER_SITE is listed as a sitedir in easy_install

--HG--
branch : distribute
extra : rebase_source : f632d56d77b31a6b4f2183728e770d00005b0060

setuptools/command/develop.py

@@ -108,7 +108,7 @@ class develop(easy_install):
             % (ei.egg_info, ei.broken_egg_info)
             )
         self.args = [ei.egg_name]
-        easy_install.finalize_options(self)
+
 
         py_version = sys.version.split()[0]
         prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')
@@ -147,6 +147,7 @@ class develop(easy_install):
             self.install_dir = self.install_purelib
             self.script_dir = self.install_scripts
 
+        easy_install.finalize_options(self)
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 

setuptools/command/easy_install.py

@@ -1211,7 +1211,12 @@ def get_site_dirs():
         site_lib = get_python_lib(plat_specific)
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
+    if sys.version >= "2.6":
+        import site
+        sitedirs.append(site.USER_SITE)
+
     sitedirs = map(normalize_path, sitedirs)
+
     return sitedirs
 
 

setuptools/tests/test_develop.py

@@ -59,5 +59,6 @@ class TestDevelopTest(unittest.TestCase):
 
         # let's see if we got our egg link at the right place
         content = os.listdir(site.USER_SITE)
-        self.assertEquals(content, ['UNKNOWN.egg-link'])
+        content.sort()
+        self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])