last minute fixes for 0.14rc1

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> When I make installer for win32 I found 1 average thing that I need to fix
> and 1 little thing that we could to fix either in 0.14 or 0.15.
> Diff attached.
> 

- ------------------------------------------------------------------------

=== modified file 'setup.py'
- --- setup.py	2007-01-15 03:31:34 +0000
+++ setup.py	2007-01-17 22:52:02 +0000
@@ -17,7 +17,7 @@
 META_INFO = {'name':         'bzr',
              'version':      bzrlib.__version__,
              'author':       'Canonical Ltd',
- -             'author_email': 'bazaar-ng at lists.ubuntu.com',
+             'author_email': 'bazaar at lists.ubuntu.com',
              'url':          'http://www.bazaar-vcs.org/',
              'description':  'Friendly distributed version control system',
              'license':      'GNU GPL v2',

^- If you are going to fix the email, it should be
"bazaar at lists.canonical.com". (they both work, but that is the
'official' address).


@@ -197,6 +197,12 @@
     if sys.version.startswith('2.4'):
         # adding elementtree package
         additional_packages.append('elementtree')
+    elif sys.version.startswith('2.5'):
+        additional_packages.append('xml.etree')
+    else:
+        import warnings
+        warnings.warn('Unknown Python version.\n'
+                      'Please check setup.py script for compatibility.')

     options_list = {"py2exe": {"packages": BZRLIB['packages'] +
                                            additional_packages,


I thought 'xml.etree' was bundled with python2.5. Do you have to select
packages in stdlib for installation? (I guess it is quite possible,
because in the past I had to import codecs...)

Either way, +1 (cond) from me, but you need to clear it with Wouter.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFr4n9JdeBCYSNAAMRAmhoAKCDAn4By0gUjyff+jNnEOhyzNBB6QCfcU4w
XmTOHn7AVsaYs+oyTiZxHso=
=6x1Q
-----END PGP SIGNATURE-----