Rev 6242: (jelmer) Fix osutils.local_concurrency() when run with newer versions on in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6242 [merge]
revision-id: pqm at pqm.ubuntu.com-20111107171235-wf4yf2zza518tp2q
parent: pqm at pqm.ubuntu.com-20111107120335-yhorvhorelcrvs0m
parent: jelmer at samba.org-20111107164609-xp2g7wwwj8p38j56
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-11-07 17:12:35 +0000
message:
  (jelmer) Fix osutils.local_concurrency() when run with newer versions on
   Python on Debian GNU/kFreeBSD. (Jelmer Vernooij)
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2011-10-12 16:00:13 +0000
+++ b/bzrlib/osutils.py	2011-11-07 16:46:09 +0000
@@ -2316,14 +2316,15 @@
     if concurrency is None:
         try:
             import multiprocessing
-        except ImportError:
+            concurrency = multiprocessing.cpu_count()
+        except (ImportError, NotImplementedError):
             # multiprocessing is only available on Python >= 2.6
+            # and multiprocessing.cpu_count() isn't implemented on all
+            # platforms
             try:
                 concurrency = _local_concurrency()
             except (OSError, IOError):
                 pass
-        else:
-            concurrency = multiprocessing.cpu_count()
     try:
         concurrency = int(concurrency)
     except (TypeError, ValueError):

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-11-01 23:06:12 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-11-07 15:08:19 +0000
@@ -72,6 +72,9 @@
 * ``bzr upgrade`` no longer treats 'already up-to-date' exceptions as
   errors. (Benoît Pierre, #716560).
 
+* Fix finding the CPU count when using Python >= 2.6 on BSD-based systems.
+  (Jelmer Vernooij, #887151)
+
 Documentation
 *************