Mercurial > kallithea
view init.d/kallithea-daemon-gentoo @ 6949:5395bb85a991
diff: fix crash when displaying diff on a single file
File diff on an image file would fail on
%if op in 'DM':
because op was None:
TypeError: 'in <string>' requires string as left operand, not NoneType
But really, if op is None, we also don't want to show invalid "Show images"
links. Thus, guard the whole image display section with having an actual op.
_parse_gitdiff will never return op None, but wrapped_diff is more lazy and
might do that. It could be considered a bug in wrapped_diff, and this change is
just a bad workaround.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 23 Oct 2017 01:15:06 +0200 |
parents | 2c3d30095d5e |
children | 71bdbf129190 |
line wrap: on
line source
#!/sbin/runscript ######################################## #### THIS IS AN GENTOO INIT.D SCRIPT#### ######################################## APP_NAME="kallithea" APP_HOMEDIR="username/python_workspace" APP_PATH="/home/$APP_HOMEDIR/$APP_NAME" CONF_NAME="production.ini" PID_PATH="$APP_PATH/$APP_NAME.pid" LOG_PATH="$APP_PATH/$APP_NAME.log" PYTHON_PATH="/home/$APP_HOMEDIR/v-env" RUN_AS="username" DAEMON="$PYTHON_PATH/bin/gearbox" DAEMON_OPTS="serve --daemon \ --user=$RUN_AS \ --group=$RUN_AS \ --pid-file=$PID_PATH \ --log-file=$LOG_PATH -c $APP_PATH/$CONF_NAME" #extra options opts="${opts} restartdelay" depend() { need nginx } start() { ebegin "Starting $APP_NAME" start-stop-daemon -d $APP_PATH -e PYTHON_EGG_CACHE="/tmp" \ --start --quiet \ --pidfile $PID_PATH \ --user $RUN_AS \ --exec $DAEMON -- $DAEMON_OPTS eend $? } stop() { ebegin "Stopping $APP_NAME" start-stop-daemon -d $APP_PATH \ --stop --quiet \ --pidfile $PID_PATH || echo "$APP_NAME - Not running!" if [ -f $PID_PATH ]; then rm $PID_PATH fi eend $? } restartdelay() { #stop() echo "sleep3" sleep 3 #start() }