Fix a minor problem with -b option, and prep for 0.3a4 release.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041035

3 files changed, 25 insertions, 5 deletions

diff --git a/EasyInstall.txt b/EasyInstall.txt
index 0b94f61c..d3eefbf5 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -206,10 +206,31 @@ Command-Line Options
     to read any documentation, examples, scripts, etc. that may have been
     included with the source distribution (if any).
 
+    This option can only be used when you are specifying a single installation
+    URL or filename, so that the installer will not be confused by the presence
+    of multiple ``setup.py`` files in the build directory.
+
 
 Release Notes/Change History
 ============================
 
+0.3a4
+ * ``pkg_resources`` now supports resource directories, not just the resources
+   in them.  In particular, there are ``resource_listdir()`` and
+   ``resource_isdir()`` APIs.
+
+ * ``pkg_resources`` now supports "egg baskets" -- .egg zipfiles which contain
+   multiple distributions in subdirectories whose names end with ``.egg``.
+   Having such a "basket" in a directory on ``sys.path`` is equivalent to
+   having the individual eggs in that directory, but the contained eggs can
+   be individually added (or not) to ``sys.path``.  Currently, however, there
+   is no automated way to create baskets.
+
+ * Namespace package manipulation is now protected by the Python import lock.
+
+ * Restrict ``--build-directory=DIR/-b DIR`` option to only be used with single
+   URL installs, to avoid running the wrong setup.py.
+
 0.3a3
  * Added ``--build-directory=DIR/-b DIR`` option.
 
@@ -226,7 +247,7 @@ Release Notes/Change History
 
 0.3a2
  * Added subversion download support for ``svn:`` and ``svn+`` URLs, as well as
- automatic recognition of HTTP subversion URLs (Contributed by Ian Bicking)
+   automatic recognition of HTTP subversion URLs (Contributed by Ian Bicking)
 
  * Added new options to ``bdist_egg`` to allow tagging the egg's version number
    with a subversion revision number, the current date, or an explicit tag
@@ -234,7 +255,6 @@ Release Notes/Change History
 
  * Misc. bug fixes
 
-
 0.3a1
  Initial release.
 
diff --git a/easy_install.py b/easy_install.py
index 45590b62..7bef0563 100755
--- a/easy_install.py
+++ b/easy_install.py
@@ -674,10 +674,11 @@ def main(argv, factory=Installer):
                       default=None,
                       help="download/extract/build in DIR; keep the results")
     (options, args) = parser.parse_args()
-
     try:
         if not args:
             parser.error("No urls, filenames, or requirements specified")
+        elif len(args)>1 and options.tmpdir is not None:
+            parser.error("Build directory can only be set when using one URL")
         for spec in args:
             inst = factory(
                 options.instdir, options.zip_ok, options.multi, options.tmpdir
@@ -694,7 +695,6 @@ def main(argv, factory=Installer):
         print >>sys.stderr,"error:",v
         sys.exit(1)
 
-
 if __name__ == '__main__':
     main(sys.argv[1:])
 
diff --git a/setup.py b/setup.py
index fefe2c31..42f246cc 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from distutils.version import LooseVersion
 
 setup(
     name="setuptools",
-    version="0.3a3",
+    version="0.3a4",
 
     description="Distutils packaging and installation enhancements",
     author="Phillip J. Eby",