svn commit: r1465568 - in /bloodhound/branches/0.5/installer: README.rst bloodhound_setup.py

[rj...@apache.org]

Author: rjollos
Date: Mon Apr  8 08:45:37 2013
New Revision: 1465568

URL: http://svn.apache.org/r1465568
Log:
Refs #493: Install script was including the non-existent bhsearch wiki pages. Some changes on the trunk had been merged which shouldn't have been included in 0.5.1. Updated the install doc to mention that the virtualenv needs to include system site packages.

Modified:
    bloodhound/branches/0.5/installer/README.rst
    bloodhound/branches/0.5/installer/bloodhound_setup.py

Modified: bloodhound/branches/0.5/installer/README.rst
URL: http://svn.apache.org/viewvc/bloodhound/branches/0.5/installer/README.rst?rev=1465568&r1=1465567&r2=1465568&view=diff
==============================================================================
--- bloodhound/branches/0.5/installer/README.rst (original)
+++ bloodhound/branches/0.5/installer/README.rst Mon Apr  8 08:45:37 2013
@@ -101,13 +101,13 @@ Installation and Initial Configuration
 Environment setup is achieved with the following commands on linux::
 
   $ cd bloodhound/installer
-  $ virtualenv bloodhound
+  $ virtualenv --system-site-packages bloodhound
   $ source ./bloodhound/bin/activate
 
 or on windows::
 
   $ cd bloodhound\installer
-  $ virtualenv bloodhound
+  $ virtualenv --system-site-packages bloodhound
   $ bloodhound\bin\activate.bat
 
 From now on, all shell commands should be run within the activated virtualenv

Modified: bloodhound/branches/0.5/installer/bloodhound_setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/0.5/installer/bloodhound_setup.py?rev=1465568&r1=1465567&r2=1465568&view=diff
==============================================================================
--- bloodhound/branches/0.5/installer/bloodhound_setup.py (original)
+++ bloodhound/branches/0.5/installer/bloodhound_setup.py Mon Apr  8 08:45:37 2013
@@ -231,9 +231,7 @@ class BloodhoundSetup(object):
         bloodhound.onecmd('upgrade')
         pages = []
         pages.append(pkg_resources.resource_filename('bhdashboard',
-                                                 'default-pages'))
-        pages.append(pkg_resources.resource_filename('bhsearch',
-                                                 'default-pages'))
+                                                     'default-pages'))
         bloodhound.onecmd('wiki load %s' % " ".join(pages))
 
         print "Running wiki upgrades"