Changeset 0ac15a1 for asadb/util

Timestamp:

Apr 5, 2012, 1:12:37 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

a03cb61

Parents:

ffecc7f (diff), a9a8f3d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (04/05/12 01:12:37)

git-committer:

Alex Dehnert <adehnert@…> (04/05/12 01:12:37)

Message:

Merge branch 'office-access'

Location:

asadb/util

Files:

• emails.py (modified) (1 diff)
• warehouse-refresh.sh (modified) (2 diffs)

asadb/util/emails.py

@@ -4 +4 @@
 
 def email_from_template(tmpl, context,
-        subject, to=[], cc=[], from_email='asa-db@mit.edu', ):
+        subject, to=[], cc=[], from_email=None, ):
     tmpl_obj = get_template(tmpl)
     ctx = Context(context)

asadb/util/warehouse-refresh.sh

@@ -2 +2 @@
 
 author="$USER warehouse-refresh.sh on $(hostname) <asa-db@mit.edu>"
+basedir="$(dirname "$(readlink -f "$0")")"
+database="$("$basedir/../settings/fetch" database NAME)"
 
 date
 
-cd saved-data
+cd "$basedir/saved-data"
 
-mysqldump --skip-extended-insert asa+forms > data.sql
+mysqldump --skip-extended-insert "$database" > data.sql
 
 echo
@@ -20 +22 @@
 echo
 echo Performing replacement
-echo "TRUNCATE TABLE groups_group" | mysql asa+forms
+echo "TRUNCATE TABLE groups_group" | mysql "$database"
 ../import_db.py < ../warehouse-dump.csv > /dev/null
-mysqldump --skip-extended-insert asa+forms > data.sql
+mysqldump --skip-extended-insert "$database" > data.sql
 
 echo