Merged [4991] from adam@nostrum.com:

Fixing time column wrapping problem that exhibits in (at least) Safari.
 - Legacy-Id: 5008
Note: SVN reference [4991] has been migrated to Git commit 5e38459

Author: levkowetz

debug.py

@@ -5,9 +5,9 @@
     import syslog
     write = syslog.syslog
 except ImportError:                     # import syslog will fail on Windows boxes
-    import sys
-    write = lambda x: sys.stderr.write(x+"\n")
-except ImportError:
+    pass
+import sys
+write = lambda x: sys.stderr.write(x+"\n")
 
 from pprint import pformat
 import cProfile
@@ -116,7 +116,7 @@ def log(name):
         frame = inspect.stack()[1][0]
         value = eval(name, frame.f_globals, frame.f_locals)
         indent = ' ' * (_report_indent[0])
-        syslog.syslog("%s%s: %s" % (indent, name, value))
+        write("%s%s: %s" % (indent, name, value))
 
 def pprint(name):
     if debug:

ietf/templates/meeting/agenda.html

@@ -68,6 +68,8 @@
 .bgblack, .bgblack a { background-color: black; color: white; }
 .groupagenda { display:none; }
 
+.timecolumn { white-space:nowrap; }
+
 {% endblock morecss %}
 
 {% block pagehead %}
@@ -303,7 +305,7 @@ <h2 class="ietf-divider">{{ slot.time|date:"l"|upper }}, {{ slot.time|date:"F j,
    {% endifchanged %}
    {% ifchanged %}
       <tr class="time-title">
-         <td colspan="1">
+         <td colspan="1" class="timecolumn">
            {{slot.time|date:"Hi"}}-{{slot.end_time|date:"Hi"}}
          </td>
          <td colspan="5">

ietf/utils/log.py

@@ -4,8 +4,10 @@
     import syslog
     write = syslog.syslog
 except ImportError:                     # import syslog will fail on Windows boxes
-    import sys
-    write = lambda x: sys.stderr.write(x+"\n")
+    pass
+    
+import sys
+write = lambda x: sys.stderr.write(x+"\n")
 
 import inspect
 import os.path

test/mkdevbranch

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=0.21
+version=0.22
 program=${0##*/}
 progdir=${0%/*}
 if [ "$progdir" = "$program" ]; then progdir="."; fi
@@ -28,7 +28,7 @@ function version() {
 #[ $1 -gt 70 ]  || die "Expected the ietf number as argument on the command line, but found '$1'"
 
 #if [ "$1" ]; then arg=$1; else arg=$(svn info http://svn.tools.ietf.org/svn/tools/ietfdb/trunk/ | egrep "^Last Changed Rev" | awk '{print $4}'); fi
-if [ "$1" ]; then arg=$1; else arg=$(svn ls http://svn.tools.ietf.org/svn/tools/ietfdb/tags/ | egrep '^[0-9]' | tail -n 1 | sed -r 's/^(.*)\/$/v\1/' ); fi
+if [ "$1" ]; then arg=$1; else arg=$(svn ls http://svn.tools.ietf.org/svn/tools/ietfdb/tags/ | grep '^[1-9]' | tail -n 1 | sed -r 's/^(.*)\/$/v\1/' ); fi
 
 if [ "${arg:0:1}" = "v" ]; then
     source="tags/${arg:1}"
@@ -52,16 +52,18 @@ function mksvndir() {
 }
 
 num=$( < /www/tools.ietf.org/meta/current-ietf-number.txt)
-trac-admin /www/tools.ietf.org/tools/ietfdb wiki export IETF${num}SprintSignUp	\
+for n in $(seq $((num-5)) $num); do
+    trac-admin /www/tools.ietf.org/tools/ietfdb wiki export IETF${n}SprintSignUp	\
 	| egrep "^\|\|" | tail -n +2 | python -c '
 import sys, re
 for line in sys.stdin:
     blank, name, email, rest = line.strip().split("||", 3)
     login, dummy  = re.split("[@.]", email, 1)
     print "\t".join((login.strip().lower(), email.strip().lower(), name.strip())) ' \
-	| $progdir/update $progdir/sprint$num.txt
+	| update $progdir/sprint$n.txt
+done
 
-cat $(ls $progdir/sprint*.txt | tail -n 4) | sed 's/[ \t]*$//' | sort | uniq | while read login email name; do 
+cat $(ls $progdir/sprint*.txt | tail -n 2) | sed 's/[ \t]*$//' | sort | uniq | while read login email name; do 
     echo ""
     echo "$login ($name <$email>):"
     mksvndir $login
@@ -75,14 +77,14 @@ cat $(ls $progdir/sprint*.txt | tail -n 4) | sed 's/[ \t]*$//' | sort | uniq | w
 
 	    A new SVN branch has been set up for you for IETF datatracker coding, at
 	      http://svn.tools.ietf.org/svn/tools/ietfdb/personal/$login/$target
-	    ${rev:+This branch is based on $rev.  }You can check it out by doing
+	      ${rev:+This branch is based on $rev.  }You can check it out by doing
 	      svn co http://svn.tools.ietf.org/svn/tools/ietfdb/personal/$login/$target
 
 	    (More instructions about setup is available at
 	      http://trac.tools.ietf.org/tools/ietfdb/wiki/SprintCoderSetup)
 
 
-	    Best,
+	    Best regards,
 
 	           Henrik (via the $program script)