summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-09-03 11:59:55 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-09-03 11:59:55 +0000
commitd2127cb280720aed2e01a5ab4981322043800614 (patch)
tree14545360c2223127005e59b7b8339800615603b4
parent15670a13bab405ddda1a126a5ade4ceaff31dc0c (diff)
downloadbcfg2-d2127cb280720aed2e01a5ab4981322043800614.tar.gz
bcfg2-d2127cb280720aed2e01a5ab4981322043800614.tar.bz2
bcfg2-d2127cb280720aed2e01a5ab4981322043800614.zip
EncapPackages: Make sure we replace setup.py with an original copy even if
the Python build fails git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2175 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--encap/README7
-rw-r--r--encap/TODO14
-rw-r--r--encap/src/encap-profiles/bcfg2-python-2.4.3.ep1
3 files changed, 19 insertions, 3 deletions
diff --git a/encap/README b/encap/README
index 5caf3ef53..46cff66c3 100644
--- a/encap/README
+++ b/encap/README
@@ -1,3 +1,7 @@
+EncapPackages | '''EncapReadme''' | EncapInstall | EncapHowto
+
+----
+
= EncapReadme: Encap based bootstrap for bcfg2 and complete bcfg2 toolchain =
This code is a method for getting bcfg2, including all dependencies, up and
@@ -112,4 +116,5 @@ Note that the doc for the encap profile format is in
1. Set up your server and clients; see [wiki:EncapHowto HOWTO]
== Documentation Version ==
-$Id$
+ * This is a copy of: $Id$
+ * Most recent version: http://www.bcfg2.org/browser/trunk/bcfg2/encap/README
diff --git a/encap/TODO b/encap/TODO
index 7de80b70c..e4ef34cdb 100644
--- a/encap/TODO
+++ b/encap/TODO
@@ -5,17 +5,27 @@
* Fix "from httplib import HTTPS" issue
* Update README and post to Wiki
+
+ * Update EncapPackages on the Wiki
* Build everywhere, basic test
+ * Fix bcfg2bump (see IRC)
+
+ * Test bcfg2bump
+
== For 0.8.4 ==
- * Possibly add GNU Readline library for python
+ * Move from lxml (+deps) to elementtree for client
+ * Maybe just move to Python 2.5 (which includes elementtree) if final comes
+ out on schedule (Sept 12th, 2006 is planned final release date)
- * Write HOWTO
+ * Possibly add GNU Readline library for python
* Packages all deps of new reports (django etc.) for GNU/Linux
+ * Write HOWTO
+
== For 0.8.5 or earlier ==
* Cut down distribution size to something more reasonable
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
index d94aba979..fd4ace06b 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.3.ep
@@ -64,6 +64,7 @@ PLATFORM_ENDIF
>
<configure>
+if [ -f setup.py.orig ]; then cp setup.py.orig setup.py; fi
cat setup.py \
| sed s:\/usr\/local\/:\/usr\/local\/lib\/bcfg2\/:g \
| sed s:\/usr\/local\/lib\/bcfg2\/ssl\/include:\/usr\/local\/lib\/bcfg2\/include:g \