/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-03 05:31:03 UTC
  • mfrom: (4857 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4887.
  • Revision ID: john@arbash-meinel.com-20091203053103-00z8bryoyfhm9x52
Merge bzr.dev 4857 to get the graph => _mod_graph fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
1981
1981
    anything goes wrong.
1982
1982
    """
1983
1983
    global _cached_local_concurrency
 
1984
 
1984
1985
    if _cached_local_concurrency is not None and use_cache:
1985
1986
        return _cached_local_concurrency
1986
1987
 
1987
 
    try:
1988
 
        concurrency = _local_concurrency()
1989
 
    except (OSError, IOError):
1990
 
        concurrency = None
 
1988
    concurrency = os.environ.get('BZR_CONCURRENCY', None)
 
1989
    if concurrency is None:
 
1990
        try:
 
1991
            concurrency = _local_concurrency()
 
1992
        except (OSError, IOError):
 
1993
            pass
1991
1994
    try:
1992
1995
        concurrency = int(concurrency)
1993
1996
    except (TypeError, ValueError):