1 patch for repository zooko@dev.allmydata.org:/home/darcs/tahoe-lafs/trunk: Fri Jan 28 07:20:06 MST 2011 zooko@zooko.com * setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement(). New patches: [setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError zooko@zooko.com**20110128142006 Ignore-this: 57d4bc9298b711e4bc9dc832c75295de I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement(). ] hunk ./src/allmydata/__init__.py 363 for requirement in install_requires: try: check_requirement(requirement, vers_and_locs) - except Exception, e: + except (ImportError, PackagingError), e: errors.append("%s: %s" % (e.__class__.__name__, e)) if errors: Context: [setup: adjust tests to use the new interface of check_requirement which has a 3-tuples instead of a 2-tuple zooko@zooko.com**20110128141546 Ignore-this: d4c6197c78c156e7ae3c3444d81db9ed fixes #1339 ] [src/allmydata/__init__.py: fix #1339, give an indication in the --version[-and-path] output of when the imported setuptools is distribute, and use a separate element in _vers_and_locs_list tuples for information other than the package name and location. This also changes slightly how the sqlite version is reported. david-sarah@jacaranda.org**20110128054150 Ignore-this: 47e8d2afed1f8114681e9094dc93276 ] [TAG allmydata-tahoe-1.8.2b1 warner@lothar.com**20110126061431] Patch bundle hash: c8da509bca7b02bc0f9350168254d2c636d454ce