[merge] look for plugins in arch-independent site directory (was Re: Bundling more plugins into bzrtools)

[Alexander Belchenko]

Alexander Belchenko has voted resubmit.
Status is now: Resubmit
Comment:
Toshio, I'm trying to merge your patch, but unfortunately it breaks test 
suite. You should update failed test as well.

======================================================================
FAIL: test_set_plugins_path_with_trailing_slashes 
(bzrlib.tests.test_plugins.TestSetPluginsPath)

vvvv[log from 
bzrlib.tests.test_plugins.TestSetPluginsPath.test_set_plugins_path_with_trailing_slashes]

^^^^[log from 
bzrlib.tests.test_plugins.TestSetPluginsPath.test_set_plugins_path_with_trailing_slashes]
----------------------------------------------------------------------
Traceback (most recent call last):
   File 
"/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_plugins.py", 
line 431, in test_set_plugins_path_with_trailing_slashes
     self.assertEqual(expected_path, bzrlib.plugins.__path__)
AssertionError: not equal:
a = ['first', 'second', 
'/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins']
b = ['first',
  'second',
  '/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins',
  '/usr/lib/python2.4/site-packages/bzrlib/plugins']


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C47B5F512.50802%40gmail.com%3E