@@ -16,6 +16,7 @@

 # It also assumes default install location (/opt/stack/xxx)

 # to aid in debug, you should also verify that you've added

 # an output directory for screen logs:

+#

 #     SCREEN_LOGDIR=/opt/stack/screen-logs

 CERT_DIR=$(cd $(dirname "$0") && pwd)

@@ -2,10 +2,15 @@

 #

 # The following variables are assumed to be defined by certain functions:

 #

+# - ``DATABASE_BACKENDS``

 # - ``ENABLED_SERVICES``

 # - ``FILES``

 # - ``GLANCE_HOSTPORT``

+# - ``REQUIREMENTS_DIR``

+# - ``STACK_USER``

 # - ``TRACK_DEPENDS``

+# - ``UNDO_REQUIREMENTS``

+#

 # Include the common functions

 FUNC_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}") && pwd)

@@ -45,7 +50,7 @@ function cleanup_tmp {

 # Updates the dependencies in project_dir from the

 # openstack/requirements global list before installing anything.

 #

-# Uses globals ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``

+# Uses globals ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``, ``UNDO_REQUIREMENTS``

 # setup_develop directory

 function setup_develop() {

     local project_dir=$1

@@ -4,8 +4,8 @@

 # Dependencies:

 #

 # - ``functions`` file

-# -``STACK_USER`` must be defined

-

+# - ``STACK_USER`` must be defined

+#

 # lib/apache exports the following functions:

 #

 # - is_apache_enabled_service

@@ -2,7 +2,8 @@

 # Install and start **Marconi** service

 # To enable a minimal set of Marconi services, add the following to localrc:

-#   enable_service marconi-server

+#

+#     enable_service marconi-server

 #

 # Dependencies:

 # - functions

@@ -6,8 +6,9 @@

 # This is appropriate for python libraries that release to pypi and are

 # expected to be used beyond OpenStack like, but are requirements

 # for core services in global-requirements.

-#    * wsme

-#    * pecan

+#

+#     * wsme

+#     * pecan

 #

 # This is not appropriate for stackforge projects which are early stage

 # OpenStack tools

@@ -54,9 +54,7 @@ $0 -P -C mytenant -u myuser -p mypass

 EOF

 }

-if ! options=$(getopt -o hPAp:u:r:C: -l os-username:,os-password:,os-tenant-name:,os-tenant-id:,os-auth-url:,target-dir:,skip-tenant:,os-cacert:,help,debug -- "$@")

-then

-    #parse error

+if ! options=$(getopt -o hPAp:u:r:C: -l os-username:,os-password:,os-tenant-name:,os-tenant-id:,os-auth-url:,target-dir:,skip-tenant:,os-cacert:,help,debug -- "$@"); then

     display_help

     exit 1

 fi

@@ -70,7 +70,8 @@ if [[ -d $dir ]]; then

 fi

 # Ubuntu 12.04

-# -----

+# ------------

+

 # We can regularly get kernel crashes on the 12.04 default kernel, so attempt

 # to install a new kernel

 if [[ ${DISTRO} =~ (precise) ]]; then