Rev 5928: (jameinel) Fix bug #787122, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5928 [merge]
revision-id: pqm at pqm.ubuntu.com-20110527155502-5eo2hhxcggumdfrt
parent: pqm at pqm.ubuntu.com-20110527135441-mc4grvluic3smy04
parent: john at arbash-meinel.com-20110527134326-2dggd5vhzsuzb9pe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-05-27 15:55:02 +0000
message:
  (jameinel) Fix bug #787122,
   pass build_mo to all the builders. (John A Meinel)
modified:
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-05-27 13:12:09 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-05-27 15:55:02 +0000
@@ -36,6 +36,11 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* Pass the ``build_mo`` command to the rest of the setup() calls in
+  setup.py. The ``bdist_wininst`` and ``py2exe`` code paths were failing
+  because ``build_mo`` became a required step that they didn't know about.
+  (John Arbash Meinel, #787122)
+
 * Reports the original error when an InvalidHttpResponse exception is
   encountered to facilitate debug. (Vincent Ladeuil, #788530)
 

=== modified file 'setup.py'
--- a/setup.py	2011-05-17 00:45:09 +0000
+++ b/setup.py	2011-05-26 21:24:36 +0000
@@ -502,13 +502,13 @@
             # help pages
             'data_files': find_docs(),
             # for building pyrex extensions
-            'cmdclass': {'build_ext': build_ext_if_possible},
+            'cmdclass': command_classes,
            }
 
     ARGS.update(META_INFO)
     ARGS.update(BZRLIB)
     ARGS.update(PKG_DATA)
-    
+
     setup(**ARGS)
 
 elif 'py2exe' in sys.argv:
@@ -725,13 +725,14 @@
             self.optimize = 2
 
     if __name__ == '__main__':
+        command_classes['install_data'] = install_data_with_bytecompile
+        command_classes['py2exe'] = py2exe_no_oo_exe
         setup(options=options_list,
               console=console_targets,
               windows=gui_targets,
               zipfile='lib/library.zip',
               data_files=data_files,
-              cmdclass={'install_data': install_data_with_bytecompile,
-                        'py2exe': py2exe_no_oo_exe},
+              cmdclass=command_classes,
               )
 
 else: