Fix bug in prepare-pristine, add secret key to wordpress, docs update.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index d98555b5ae5cbc725dcff8ebe305f6fe58b7f105..ab5b0c684be09e5760bac6fd8140bfc3b2c4658f 100644 (file)
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -37,6 +37,7 @@ Next, you merge those changes to the scriptsified ``master`` copy::
     git merge pristine --no-commit
     # resolve conflicts
     git commit -asm "$APPLICATION $VERSION-scripts"
+    git tag $APP-$VERSION
 
 .. note::
 
@@ -55,7 +56,19 @@ file, make sure that no upstream changes broke our regular expressions
 for matching.  Then amend your commit and push back::
 
     git commit --amend -a
-    git push --force
+    git tag $APP-$VERSION-scripts
+    git push --force --tags
+
+On any other copies that have the older commit, run the following commands
+while on the ``master`` branch to grab the new version::
+
+    git fetch --tags $REMOTE
+    git reset --hard $REMOTE/master
+
+Be sure to verify that your commit is the correct one; you can check with
+``git show``, which should show the changes you made when amending the
+commit.  Be especially careful to make sure you don't nuke any in
+configuration scripts changes.
 
 Troubleshooting
 ---------------

diff --git a/wizard/app/wordpress.py b/wizard/app/wordpress.py
index c14599dc5cfdf3c90722409b2581112071236695..ad0b2fc9f63094a3fc9cba37d96cadc9a4985257 100644 (file)
--- a/wizard/app/wordpress.py
+++ b/wizard/app/wordpress.py
@@ -13,6 +13,7 @@ seed = util.dictmap(make_filename_regex_define, {
     'WIZARD_DBNAME': 'DB_NAME',
     'WIZARD_DBUSER': 'DB_USER',
     'WIZARD_DBPASSWORD': 'DB_PASSWORD',
+    'WIZARD_SECRETKEY': 'SECRET_KEY',
     })
 # XXX: I have omitted an implementation for table prefix, on grounds that we
 # do not permit it to be configured. If we do end up growing support for

diff --git a/wizard/command/prepare_pristine.py b/wizard/command/prepare_pristine.py
index d6ba256552f3b8084aa0a0a15c78ba113919a906..c24a9fe18631dbcd2df5842bc8288d9443c3fbe3 100644 (file)
--- a/wizard/command/prepare_pristine.py
+++ b/wizard/command/prepare_pristine.py
@@ -62,7 +62,7 @@ def check_directory(options):
         raise Exception("Unversioned files exist, refusing to remove (override with --force)")
     try:
         sh.call("git", "rev-parse", "HEAD")
-        _, _, ref = open(".git/HEAD").read().partition(' ')
+        _, _, ref = open(".git/HEAD").read().rstrip().partition(' ')
         if not options.force:
             if ref != "refs/heads/pristine" and os.path.exists(os.path.join(".git", ref)):
                 raise Exception("Not on pristine branch (override with --force)")