altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Carry patches to the production back to trunk.

Browse source 
- Legacy-Id: 11673
This commit is contained in:
Henrik Levkowetz 2016-07-16 13:33:16 +00:00
parent a0ec79474b
commit 61540ac4bb
2 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
bin/hourly
View file

@ -20,8 +20,8 @@ logger -p user.info -t cron "Running $DTDIR/bin/hourly"
# $DTDIR/ietf/manage.py update_community_lists
#
# # Polling backup for iana and rfc-editory post APIs
# $DTDIR/ietf/bin/iana-changes-updates
# $DTDIR/ietf/bin/iana-protocols-updates
$DTDIR/ietf/bin/iana-changes-updates
$DTDIR/ietf/bin/iana-protocols-updates
# $DTDIR/ietf/bin/rfc-editor-index-updates
# $DTDIR/ietf/bin/rfc-editor-queue-updates
#
@ -35,35 +35,35 @@ logger -p user.info -t cron "Running $DTDIR/bin/hourly"
# ( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \
# ( cd /a/postfix; /usr/sbin/postmap -o group-virtual; )
#
# # Generate some static files
# ID=/a/www/ietf-ftp/internet-drafts/
# DOWNLOAD=/a/www/www6s/download/
#
# export TMPDIR=/a/tmp
#
# TMPFILE1=`mktemp` || exit 1
# TMPFILE2=`mktemp` || exit 1
# TMPFILE3=`mktemp` || exit 1
# TMPFILE4=`mktemp` || exit 1
# TMPFILE5=`mktemp` || exit 1
# TMPFILE6=`mktemp` || exit 1
# TMPFILE7=`mktemp` || exit 1
# chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7
#
# python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1
# python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2
# python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3
# cp $TMPFILE1 $TMPFILE4
# cp $TMPFILE2 $TMPFILE5
# cp $TMPFILE3 $TMPFILE6
# python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7
#
# mv $TMPFILE1 $ID/all_id.txt
# mv $TMPFILE2 $ID/1id-index.txt
# mv $TMPFILE3 $ID/1id-abstracts.txt
# mv $TMPFILE4 $DOWNLOAD/id-all.txt
# mv $TMPFILE5 $DOWNLOAD/id-index.txt
# mv $TMPFILE6 $DOWNLOAD/id-abstract.txt
# mv $TMPFILE7 $ID/all_id2.txt
#
# Generate some static files
ID=/a/www/ietf-ftp/internet-drafts/
DOWNLOAD=/a/www/www6s/download/
export TMPDIR=/a/tmp
TMPFILE1=`mktemp` || exit 1
TMPFILE2=`mktemp` || exit 1
TMPFILE3=`mktemp` || exit 1
TMPFILE4=`mktemp` || exit 1
TMPFILE5=`mktemp` || exit 1
TMPFILE6=`mktemp` || exit 1
TMPFILE7=`mktemp` || exit 1
chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7
python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1
python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2
python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3
cp $TMPFILE1 $TMPFILE4
cp $TMPFILE2 $TMPFILE5
cp $TMPFILE3 $TMPFILE6
python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7
mv $TMPFILE1 $ID/all_id.txt
mv $TMPFILE2 $ID/1id-index.txt
mv $TMPFILE3 $ID/1id-abstracts.txt
mv $TMPFILE4 $DOWNLOAD/id-all.txt
mv $TMPFILE5 $DOWNLOAD/id-index.txt
mv $TMPFILE6 $DOWNLOAD/id-abstract.txt
mv $TMPFILE7 $ID/all_id2.txt
# exit 0

2
ietf/secr/proceedings/proc_utils.py
View file

@ -40,7 +40,7 @@ def check_audio_files(group,meeting):
Example: ietf90-salonb-20140721-1710-pm3.mp3
'''
for session in Session.objects.filter(group=group,meeting=meeting,status__in=('sched','schedw')):
for session in Session.objects.filter(group=group,meeting=meeting,status='sched'):
try:
timeslot = session.official_timeslotassignment().timeslot
except IndexError: