summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-11-14 16:48:22 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-11-14 16:48:22 -0500
commitb0575d04cb0bd23a5d0185daccfe5916ce919cac (patch)
tree692aabe74c1a4a92694298895553ed7e10fa4480
parent203be310b0810da95a73ee7d333f0da7c9a07acf (diff)
downloadabslibre-b0575d04cb0bd23a5d0185daccfe5916ce919cac.tar.gz
abslibre-b0575d04cb0bd23a5d0185daccfe5916ce919cac.tar.bz2
abslibre-b0575d04cb0bd23a5d0185daccfe5916ce919cac.zip
update libre/parabolaweb-utils: run update_types_permissions if it exists
-rw-r--r--libre/parabolaweb-utils/PKGBUILD6
-rw-r--r--libre/parabolaweb-utils/parabolaweb-update17
2 files changed, 14 insertions, 9 deletions
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 5000e0201..bfdfc54da 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=parabolaweb-utils
pkgver=`_get_pkgver`
-pkgrel=6
+pkgrel=7
pkgdesc="Utils for the Parabola website"
arch=('any')
url="https://projects.parabolagnulinux.org/parabolaweb.git/"
@@ -18,7 +18,7 @@ depends=(
'python2-flup' # for fcgi
'postgresql' # for database
'git' # used in parabolaweb-download
- 'libretools' # used in parabolaweb-{download,update}
+ 'libretools' # used in parabolaweb-{download,update} (libremessages)
`_get_depends`)
backup=('etc/conf.d/parabolaweb')
@@ -50,7 +50,7 @@ package() {
md5sums=('SKIP'
'f162c2ce49b4cafe0a14bd4767dfea04'
- 'a73063b14746720b77fdbab851f5c161'
+ '184f3e52781747369d8e26abc9723f7c'
'd5294495f42df29d29519ebd0a8f6093'
'cc15e153f99fba82e7bb032896f655c2'
'a468016a7155b5da46521dcfc6428384'
diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
index 45e17c4f2..178917673 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 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 permission..."
+ ./manage.py update_types_permissions
+ fi
+ msg2 "Loading fixtures..."
./manage.py loaddata */fixtures/*.json
}