diff options
| author |   Marien Zwart <marienz@gentoo.org> | 2006-09-24 20:59:17 +0000 |
|---|---|---|
| committer | Marien Zwart <marienz@gentoo.org> | 2006-09-24 20:59:17 +0000 |
| commit | 90e7ae13ddaa55552587841a8303af843f2bcf0a (patch) | |
| tree | b4085c29c734eb4389cb3bc9732d6f5a6bedfbf9 /dev-util/bzr/files | |
| parent | Fix DEPEND/RDEPEND. (diff) | |
| download | gentoo-2-90e7ae13ddaa55552587841a8303af843f2bcf0a.tar.gz gentoo-2-90e7ae13ddaa55552587841a8303af843f2bcf0a.tar.bz2 gentoo-2-90e7ae13ddaa55552587841a8303af843f2bcf0a.zip | |
Clean up old versions. Fix dependency bug spotted by Flameeyes. Bump to 0.10-r1 with a patch to mostly work with python 2.5.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'dev-util/bzr/files')
| -rw-r--r-- | dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch | 51 | ||||
| -rw-r--r-- | dev-util/bzr/files/digest-bzr-0.10-r1 | 3 |
2 files changed, 54 insertions, 0 deletions
diff --git a/dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch b/dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch new file mode 100644 index 000000000000..fdb2fc0c8b16 --- /dev/null +++ b/dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch @@ -0,0 +1,51 @@ +=== modified file 'bzrlib/errors.py' +--- bzrlib/errors.py 2006-08-22 21:31:23 +0000 ++++ bzrlib/errors.py 2006-09-21 21:01:04 +0000 +@@ -44,7 +44,7 @@ + >>> try: + ... raise NotBranchError(path='/foo/bar') + ... except: +-... print sys.exc_type ++... print '%s.%s' % (sys.exc_type.__module__, sys.exc_type.__name__) + ... print sys.exc_value + ... path = getattr(sys.exc_value, 'path', None) + ... if path is not None: +@@ -264,8 +264,7 @@ + + def __init__(self, msg, base, args): + PathError.__init__(self, base, msg) +- self.args = [base] +- self.args.extend(args) ++ self.args = [base] + list(args) + + + class UnsupportedProtocol(PathError): + +=== modified file 'bzrlib/plugins/launchpad/test_register.py' +--- bzrlib/plugins/launchpad/test_register.py 2006-05-16 02:31:06 +0000 ++++ bzrlib/plugins/launchpad/test_register.py 2006-09-21 21:44:39 +0000 +@@ -71,6 +71,9 @@ + + class InstrumentedXMLRPCTransport(xmlrpclib.Transport): + ++ # Python 2.5's xmlrpclib looks for this. ++ _use_datetime = False ++ + def __init__(self, testcase): + self.testcase = testcase + + +=== modified file 'bzrlib/trace.py' +--- bzrlib/trace.py 2006-08-22 21:39:33 +0000 ++++ bzrlib/trace.py 2006-09-21 20:53:45 +0000 +@@ -288,7 +288,8 @@ + """Report an exception that probably indicates a bug in bzr""" + import traceback + exc_type, exc_object, exc_tb = exc_info +- print >>err_file, "bzr: ERROR: %s: %s" % (exc_type, exc_object) ++ print >>err_file, "bzr: ERROR: %s.%s: %s" % ( ++ exc_type.__module__, exc_type.__name__, exc_object) + print >>err_file + traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file) + print >>err_file + diff --git a/dev-util/bzr/files/digest-bzr-0.10-r1 b/dev-util/bzr/files/digest-bzr-0.10-r1 new file mode 100644 index 000000000000..7872ef24a2d2 --- /dev/null +++ b/dev-util/bzr/files/digest-bzr-0.10-r1 @@ -0,0 +1,3 @@ +MD5 8a21693efe9b06bed04fa4e8a74b7e83 bzr-0.10.tar.gz 950911 +RMD160 046dd9479e516b6e9b526df5f9baa2a7ec185a5b bzr-0.10.tar.gz 950911 +SHA256 4a9b5b2d0b2c33c91dabeb0831b3da660189eb38ad9c28c929ea64b79fecc20f bzr-0.10.tar.gz 950911 |