Merge branch 'master' of gparabola:abslibre-mips64el

Conflicts:
	social/sobby/PKGBUILD
	~fauno/kyotocabinet/PKGBUILD
	~fauno/kyototycoon/PKGBUILD

1 files changed, 14 insertions, 8 deletions

diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
index 45e17c4f2..2da9eea8a 100644
--- a/libre/parabolaweb-utils/parabolaweb-update
+++ b/libre/parabolaweb-utils/parabolaweb-update
@@ -15,17 +15,18 @@ find_makefiles() {
 }
 
 clean() {
-	msg "Purging old .pyc files...."
 	cd "$WEBDIR"
+	msg "Purging old .pyc files..."
 	find . -name '*.pyc' -delete
+	msg "Purging old GNU Make generated files..."
 	for dir in `find_makefiles`; do
 		make -C "$WEBDIR/$dir" clean
 	done
 }
 
 configure() {
-	msg "Checking configuration...."
 	cd "$WEBDIR"
+	msg "Checking configuration..."
 	if [[ ! -f local_settings.py ]]; then
 		msg2 "Configuration file missing, opening editor..."
 		cp local_settings.py.example local_settings.tmp.$$.py
@@ -36,7 +37,7 @@ configure() {
 			msg "Failed to configure, exiting"
 			exit 1
 		fi
-		msg2 "Creating database...."
+		msg2 "Creating database..."
 		./manage.py syncdb
 	else
 		msg2 "Current configuration checks out"
@@ -44,11 +45,15 @@ configure() {
 }
 
 update-database() {
-	msg "Updating database...."
 	cd "$WEBDIR"
-	msg2 "Running migrations...."
+	msg "Updating database..."
+	msg2 "Running migrations..."
 	./manage.py migrate
-	msg2 "Loading fixtures...."
+	if [[ -f devel/management/commands/update_types_permissions.py ]]; then
+		msg2 "Updating permissions..."
+		./manage.py update_types_permissions
+	fi
+	msg2 "Loading fixtures..."
 	./manage.py loaddata */fixtures/*.json
 }
 
@@ -69,10 +74,11 @@ main() {
 		exit 1
 	fi
 
+	if [[ -d "$WEBDIR" ]]; then
+		clean
+	fi
 	parabolaweb-download
-	clean
 	configure
-	clean
 	update-database
 	update-filesystem
 }