You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/03/20 02:09:08 UTC

[1/2] git commit: [#5973] crazy pysvn hacking so that packaging tools know it is in the venv

[#5973] crazy pysvn hacking so that packaging tools know it is in the venv


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/55bdb40c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/55bdb40c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/55bdb40c

Branch: refs/heads/db/5973
Commit: 55bdb40c44010f1c49ef784d1ba5631a38c82287
Parents: 88669f7
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Mar 19 17:57:09 2013 -0700
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Mar 19 17:57:09 2013 -0700

----------------------------------------------------------------------
 README.markdown                               |    3 ++-
 vagrant/manifests/ubuntu-1204-server-amd64.pp |    5 +++++
 2 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/55bdb40c/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index bbd03cb..198a0f0 100644
--- a/README.markdown
+++ b/README.markdown
@@ -62,9 +62,10 @@ Although the application setup.py files define a number of dependencies, the `re
 
 This will take a while.  If you get an error from pip, it is typically a temporary download error.  Just run the command again and it will quickly pass through the packages it already downloaded and then continue.
 
-Optional, for SVN support: symlink the system pysvn package into our virtual environment
+Optional, for SVN support: symlink the system pysvn package into our virtual environment and make packaging utilities know its there.
 
     (anvil)~/src/allura$ ln -s /usr/lib/python2.7/dist-packages/pysvn ~/anvil/lib/python2.7/site-packages/
+    (anvil)~/src/allura$ mkdir ~/anvil/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info
 
 And now to setup the Allura applications for development.  If you want to setup all of them, run `./rebuild-all.bash`
 If you only want to use a few tools, run:

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/55bdb40c/vagrant/manifests/ubuntu-1204-server-amd64.pp
----------------------------------------------------------------------
diff --git a/vagrant/manifests/ubuntu-1204-server-amd64.pp b/vagrant/manifests/ubuntu-1204-server-amd64.pp
index d80e22a..6206350 100644
--- a/vagrant/manifests/ubuntu-1204-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1204-server-amd64.pp
@@ -102,6 +102,11 @@ file { '/home/vagrant/anvil/lib/python2.7/site-packages/pysvn':
   target => '/usr/lib/python2.7/dist-packages/pysvn',
   require => [ Package[ "python-svn" ], Exec[ "pip install" ]],
 }
+# and trick pip/setuptools etc to know its there
+file { '/home/vagrant/anvil/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info':
+  ensure => 'directory',
+  require => File['/home/vagrant/anvil/lib/python2.7/site-packages/pysvn'],
+}
 
 # create SCM repo dirs
 file { [ "/home/vagrant/scm", "/home/vagrant/scm/git", "/home/vagrant/scm/hg", "/home/vagrant/scm/svn" ]: