The attached trivial patch makes bzr-gtk use the standard functions for checking the version of bzrlib.
Cheers, jelmer -- Jelmer Vernooij <[email protected]> - http://samba.org/~jelmer/ Jabber: [email protected]
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: lp:bzr-gtk # testament_sha1: 0818e382b447e5e940c956c6143f438938f15505 # timestamp: 2009-01-30 16:51:43 +0100 # source_branch: http://people.samba.org/bzr/jelmer/bzr-gtk/trunk # base_revision_id: [email protected] # # Begin patch === modified file '__init__.py' --- __init__.py 2008-10-23 08:14:59 +0000 +++ __init__.py 2009-01-30 15:49:34 +0000 @@ -37,6 +37,7 @@ import sys import bzrlib +import bzrlib.api version_info = (0, 96, 0, 'dev', 1) @@ -46,28 +47,10 @@ version_string = '%d.%d.%d%s%d' % version_info __version__ = version_string -required_bzrlib = (1, 6) - -def check_bzrlib_version(desired): - """Check that bzrlib is compatible. - - If version is < bzr-gtk version, assume incompatible. - """ - bzrlib_version = bzrlib.version_info[:2] - try: - from bzrlib.trace import warning - except ImportError: - # get the message out any way we can - from warnings import warn as warning - if bzrlib_version < desired: - from bzrlib.errors import BzrError - warning('Installed Bazaar version %s is too old to be used with bzr-gtk' - ' %s.' % (bzrlib.__version__, __version__)) - raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) ) - - -if version_info[2] == "final": - check_bzrlib_version(required_bzrlib) +COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0), + (1, 10, 0), (1, 11, 0), (1, 12, 0)] + +bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS) from bzrlib.trace import warning if __name__ != 'bzrlib.plugins.gtk': # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUChg6EAAaB/gEAQAIBRb/// ejffGr////BQA7dng5LZrVKMJJITEyCbSbJppGCaNA0AANMg0AlRDEU96U2KCPU0yeoAABoAAMgH MARgmIBgEwTRkNDAJgjExAqeUaPUBiZBkADQAAxNNAACSQJkJhMkaZNQ02lG9I9SeUzNRGQaM0mk Jc0NY73+uAdTG/SpgtSLw1UYqGChLZtUals98GeN5Q6mG9RARAgRjZHwmUQJEhQo2UAaTMtJd70u FQlHP+xGDtUZS/qYHmI+G5opK7Ez7OtpOmtPAWb8mVx6MqGnw55Etd4Vt61v3Ysj6XvulEyDKKdS rW/YgiWHbsEbFOTl+zCfejVbUFQxqZ9zkoNHMFpTJhbxR9J/opHGikyCsq0lZj5GgmwOUtyTnrbc 6wTSW+024tnUKrxMDYWzx4ExVkDjE8+BfIwULS8qGUR5SX6gmVxZmXl0aLBxEiOCC+oqIIj4C0NM eQU42IGJX6TtK3TFtk9gxY3lonnM9XCt1bbnDUtXhB44ZQ0jU4fQUiqcIjKxg8mnfM4rYNGEStUD 8VaqYcIhKwlJppKa9dg41CDBtZMp4gseWRTTmqv0U5F6CFihaJyoYFCZeRoSwYYuT6FQRbidy4sL vYw9N5I0HmfgzdjHR4n5fd8nEmc+uYj6GiIMfM7TzngvQexnOoftH0HuIfIh9mc0GcySJIL8J1VD jKrVTXipqlEnA6ryirM2gRlHw6BxkP7I4k6cxGSmYJLk8ReX3SwPBmONyPBR2WBgeAxkSEdwYk+f lu7WZHej2lp7jlz4Tydj9BQoJ8yy88R4VqCbSqwzCBiEfjy3lxcSVDNRrloMHl0YnkPwF2MgwLmm 4d0St5DvL/BH8J6V08sb4CNfKZ0huIqdYE0/HmMA9fM4wxQVz2xYqmWfb6v2xDWBOjX3hJwmiedm vWQZPp1A1vaEDWXKn55rsUi3P5g6p1a4c8ZZCLDcBaWCQUFyf55KDSOTTC0UkswOjkIE2F5UhfuY 0jbvabBVKoRNMQSL9cDPU0syA8f/bgNY+APZdzLC3BPZDKR5v0FHOno4C4Z1iOG2iOsNgjQt49W5 GMU9L1NNKgIQvA6vRDCNYVCfhdZZCjDTLpulbFEist3z0Mn2COOinOEE/VDEHkGGYg5OcM3SeoR9 +ZTOjJmSdUt1FJGVW/Y8ovwaGryJNK+g8qDcHJiDKtwwuq78G2M68KKzTQDsFvVXWKCr06051bm0 4jbg/xdyRThQkEChg6E=
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
