[ARVADOS] updated: 45772b70191f0fa16b5b385f8e08b87561ed8b03

[Git user]

Summary of changes:
 build/rails-package-scripts/postinst.sh | 42 ++++++++++++---------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

  discards  5926f360ab027ed94550b56d3086d44c1e9377da (commit)
       via  45772b70191f0fa16b5b385f8e08b87561ed8b03 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (5926f360ab027ed94550b56d3086d44c1e9377da)
            \
             N -- N -- N (45772b70191f0fa16b5b385f8e08b87561ed8b03)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 45772b70191f0fa16b5b385f8e08b87561ed8b03
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Jan 6 13:29:00 2017 -0500

    In our rails postinstall package script, preserve newlines when looking
    for the '^database:' line, so that we match every line of the rake
    db:migrate:status output, not just the first one.
    
    refs #10838

diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh
index 17454ef..e019170 100644
--- a/build/rails-package-scripts/postinst.sh
+++ b/build/rails-package-scripts/postinst.sh
@@ -122,14 +122,14 @@ setup_conffile() {
 
 prepare_database() {
   DB_MIGRATE_STATUS=`$COMMAND_PREFIX bundle exec rake db:migrate:status 2>&1 || true`
-  if echo $DB_MIGRATE_STATUS | grep -qF 'Schema migrations table does not exist yet.'; then
+  if echo "$DB_MIGRATE_STATUS" | grep -qF 'Schema migrations table does not exist yet.'; then
       # The database exists, but the migrations table doesn't.
       run_and_report "Setting up database" $COMMAND_PREFIX bundle exec \
                      rake "$RAILSPKG_DATABASE_LOAD_TASK" db:seed
-  elif echo $DB_MIGRATE_STATUS | grep -q '^database: '; then
+  elif echo "$DB_MIGRATE_STATUS" | grep -q '^database: '; then
       run_and_report "Running db:migrate" \
                      $COMMAND_PREFIX bundle exec rake db:migrate
-  elif echo $DB_MIGRATE_STATUS | grep -q 'database .* does not exist'; then
+  elif echo "$DB_MIGRATE_STATUS" | grep -q 'database .* does not exist'; then
       if ! run_and_report "Running db:setup" \
            $COMMAND_PREFIX bundle exec rake db:setup 2>/dev/null; then
           echo "Warning: unable to set up database." >&2

-----------------------------------------------------------------------


hooks/post-receive
--