annotate scripts/roundup.rc-debian @ 5414:3fa026621f69

Python 3 preparation: comparisons. Python 3 no longer has the cmp function, or cmp= arguments to sorting functions / methods (key= must be used instead), and requires rich comparison methods such as __lt__ to be defined instead of using __cmp__. All of the comparison mechanisms supported in Python 3 are also supported in Python 2. This patch makes the corresponding changes in Roundup to use key functions and rich comparison methods. In the case of the JournalPassword and Permission classes, only __eq__ and __ne__ are defined as I don't see ordered comparisons as useful there (and for Permission, the old __cmp__ function didn't try to provide a valid ordering). In the case of the Date class, I kept the __cmp__ method and implemented the others in terms of it, to avoid excess repetitiveness in duplicating implementation code for all six rich comparison methods. In roundup/admin.py, help_commands_html used operator.attrgetter to produce the second argument of sorted() - which would be reasonable for a key function, but the second argument is the cmp function in Python 2, not a key function (and the key function must be a named argument not a positional argument in Python 3). That function appears to be completely unused, so I expect that code never worked. This patch adds the missing key= to that sorted() call, but it would also be reasonable to remove the unused function completely instead.
author Joseph Myers <jsm@polyomino.org.uk>
date Wed, 25 Jul 2018 00:39:37 +0000
parents 6e3e4f24c753
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1841
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1 #!/bin/sh -e
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
2 #
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
3 # roundup Startup script for the roundup http server.
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
4
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
5 DESC='Roundup HTTP-Server'
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
6
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
7 BINFILE=roundup-server
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
8 EXECUTABLE=/usr/local/bin/$BINFILE
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
9 PIDFILE=/var/run/roundup/server.pid
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
10 LOGFILE=/var/log/roundup/roundup.log
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
11 TRACKERS=tttech=/tttech/org/software/roundup/tttech/
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
12 OPTIONS="-- -p 8080 -u roundup -d $PIDFILE -l $LOGFILE $TRACKERS"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
13
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
14
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
15 test -x $EXECUTABLE || exit 0
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
16
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
17 start_stop() {
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
18 case "$1" in
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
19 start)
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
20 printf "Starting $DESC:"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
21 start-stop-daemon --start --oknodo --quiet \
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
22 --pidfile $PIDFILE \
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
23 --exec $EXECUTABLE $OPTIONS
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
24 printf " $BINFILE"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
25 printf ".\n"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
26 ;;
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
27 stop)
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
28 printf "Stopping $DESC:"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
29 start-stop-daemon --stop --oknodo --quiet \
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
30 --pidfile $PIDFILE \
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
31 --exec $EXECUTABLE $OPTIONS
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
32 printf " $BINFILE"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
33 printf ".\n"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
34 ;;
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
35 restart | force-reload)
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
36 start_stop stop
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
37 sleep 1
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
38 start_stop start
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
39 ;;
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
40 *)
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
41 printf "Usage: $0 {start|stop|restart|force-reload}\n" >&2
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
42 exit 1
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
43 ;;
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
44 esac
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
45 }
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
46
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
47 start_stop "$@"
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
48
24fb163ddece added Debian rc script
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
49 exit 0

Roundup Issue Tracker: http://roundup-tracker.org/